jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333870 )
Change subject: Migrate Varnish role from upstart to systemd
......................................................................
Migrate Varnish role from upstart to systemd
Bug: T154272
Change-Id: I77949e0b1c3fb41204b67adb0300db8915726a81
---
M puppet/modules/varnish/manifests/init.pp
A puppet/modules/varnish/templates/systemd/varnish.erb
D puppet/modules/varnish/templates/upstart.erb
3 files changed, 20 insertions(+), 25 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/varnish/manifests/init.pp
b/puppet/modules/varnish/manifests/init.pp
index 3583484..0e73965 100644
--- a/puppet/modules/varnish/manifests/init.pp
+++ b/puppet/modules/varnish/manifests/init.pp
@@ -218,16 +218,9 @@
user => 'root',
}
- file { '/etc/init/varnish.conf':
- ensure => present,
- content => template('varnish/upstart.erb'),
- mode => '0444',
- }
-
- service { 'varnish':
- ensure => running,
- provider => 'upstart',
- require => [
+ systemd::service { 'varnish':
+ ensure => 'present',
+ require => [
Exec[
'build_varnish',
'build_tbf',
@@ -235,11 +228,12 @@
],
File[
'/var/run/varnish',
- '/etc/init/varnish.conf',
'/etc/varnish/secret',
'/usr/local/var/varnish/mediawiki-vagrant'
],
],
- subscribe => File[$conf],
+ service_params => {
+ subscribe => File[$conf],
+ },
}
}
diff --git a/puppet/modules/varnish/templates/systemd/varnish.erb
b/puppet/modules/varnish/templates/systemd/varnish.erb
new file mode 100644
index 0000000..974c522
--- /dev/null
+++ b/puppet/modules/varnish/templates/systemd/varnish.erb
@@ -0,0 +1,14 @@
+[Unit]
+Description=varnish service
+Requires=mediawiki-ready.service
+After=mediawiki-ready.service
+
+[Service]
+User=varnish
+Group=varnish
+SyslogIdentifier=varnish
+ExecStart=/usr/local/sbin/varnishd -a :6081 -T localhost:6082 -f
/etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,256m -F
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/puppet/modules/varnish/templates/upstart.erb
b/puppet/modules/varnish/templates/upstart.erb
deleted file mode 100644
index da4e155..0000000
--- a/puppet/modules/varnish/templates/upstart.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-#####################################################################
-
-description "Varnish"
-
-start on mediawiki-ready
-respawn
-
-setuid varnish
-setgid varnish
-
-exec /usr/local/sbin/varnishd -a :6081 -T localhost:6082 -f
/etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,256m -F
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/333870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77949e0b1c3fb41204b67adb0300db8915726a81
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: Gilles <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
