jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330352 )
Change subject: Convert sentry to systemd
......................................................................
Convert sentry to systemd
Bug: T154266
Change-Id: I2f1d0866bc97c21fce749ecf9b5f3b8168841878
---
M puppet/modules/sentry/manifests/init.pp
A puppet/modules/sentry/templates/systemd-server.erb
A puppet/modules/sentry/templates/systemd-worker.erb
D puppet/modules/sentry/templates/upstart-server.erb
D puppet/modules/sentry/templates/upstart-worker.erb
5 files changed, 54 insertions(+), 39 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/sentry/manifests/init.pp
b/puppet/modules/sentry/manifests/init.pp
index 245df38..d75e922 100644
--- a/puppet/modules/sentry/manifests/init.pp
+++ b/puppet/modules/sentry/manifests/init.pp
@@ -154,22 +154,28 @@
],
}
- file { '/etc/init/sentry-server.conf':
+ file { '/lib/systemd/system/sentry-server.service':
ensure => present,
- content => template('sentry/upstart-server.erb'),
+ content => template('sentry/systemd-server.erb'),
mode => '0444',
}
- file { '/etc/init/sentry-worker.conf':
+ file { '/lib/systemd/system/sentry-worker.service':
ensure => present,
- content => template('sentry/upstart-worker.erb'),
+ content => template('sentry/systemd-worker.erb'),
mode => '0444',
+ }
+
+ exec { 'systemd reload for sentry':
+ refreshonly => true,
+ command => '/bin/systemctl daemon-reload',
+ subscribe => File['/lib/systemd/system/sentry-server.service',
'/lib/systemd/system/sentry-worker.service'],
}
service { 'sentry-server':
ensure => running,
enable => true,
- provider => 'upstart',
+ provider => 'systemd',
require => [
Virtualenv::Environment[$deploy_dir],
Mysql::User[$db_user],
@@ -183,7 +189,7 @@
service { 'sentry-worker':
ensure => running,
enable => true,
- provider => 'upstart',
+ provider => 'systemd',
require => [
Virtualenv::Environment[$deploy_dir],
Mysql::User[$db_user],
diff --git a/puppet/modules/sentry/templates/systemd-server.erb
b/puppet/modules/sentry/templates/systemd-server.erb
new file mode 100644
index 0000000..ac5285d
--- /dev/null
+++ b/puppet/modules/sentry/templates/systemd-server.erb
@@ -0,0 +1,21 @@
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+#####################################################################
+
+[Unit]
+Description=Sentry error log tracker (web interface)
+Requires=mediawiki-ready.service
+After=mediawiki-ready.service
+
+[Service]
+Environment="SENTRY_CONF=<%= @cfg_file %>"
+User=www-data
+Group=www-data
+SyslogIdentifier=sentry-server
+WorkingDirectory=<%= @deploy_dir %>
+ExecStart=<%= @deploy_dir %>/bin/sentry start
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/puppet/modules/sentry/templates/systemd-worker.erb
b/puppet/modules/sentry/templates/systemd-worker.erb
new file mode 100644
index 0000000..0469196
--- /dev/null
+++ b/puppet/modules/sentry/templates/systemd-worker.erb
@@ -0,0 +1,21 @@
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+#####################################################################
+
+[Unit]
+Description=Sentry error log tracker (worker)
+Requires=mediawiki-ready.service
+After=mediawiki-ready.service
+
+[Service]
+Environment="SENTRY_CONF=<%= @cfg_file %>"
+User=www-data
+Group=www-data
+SyslogIdentifier=sentry-server
+WorkingDirectory=<%= @deploy_dir %>
+ExecStart=<%= @deploy_dir %>/bin/sentry celery worker -B
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/puppet/modules/sentry/templates/upstart-server.erb
b/puppet/modules/sentry/templates/upstart-server.erb
deleted file mode 100644
index 494861c..0000000
--- a/puppet/modules/sentry/templates/upstart-server.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-#####################################################################
-
-description "Sentry error log tracker (web interface)"
-
-start on mediawiki-ready
-respawn
-
-env SENTRY_CONF="<%= @cfg_file %>"
-export SENTRY_CONF
-
-setuid www-data
-setgid www-data
-
-exec <%= @deploy_dir %>/bin/sentry start
diff --git a/puppet/modules/sentry/templates/upstart-worker.erb
b/puppet/modules/sentry/templates/upstart-worker.erb
deleted file mode 100644
index f5786cf..0000000
--- a/puppet/modules/sentry/templates/upstart-worker.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-#####################################################################
-
-description "Sentry error log tracker (worker)"
-
-start on mediawiki-ready
-respawn
-
-env SENTRY_CONF="<%= @cfg_file %>"
-export SENTRY_CONF
-
-setuid www-data
-setgid www-data
-
-exec <%= @deploy_dir %>/bin/sentry celery worker -B
-
--
To view, visit https://gerrit.wikimedia.org/r/330352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f1d0866bc97c21fce749ecf9b5f3b8168841878
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
