Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/242443
Change subject: toollabs: Make proxylistener support systemd
......................................................................
toollabs: Make proxylistener support systemd
Change-Id: I28e95bde72b48255d2326afdacdd1732055e3f25
---
M modules/toollabs/manifests/proxy.pp
A modules/toollabs/templates/initscripts/proxylistener.systemd.erb
R modules/toollabs/templates/initscripts/proxylistener.upstart.erb
3 files changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/242443/1
diff --git a/modules/toollabs/manifests/proxy.pp
b/modules/toollabs/manifests/proxy.pp
index 55ccca8..5bbb8a8 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -60,18 +60,11 @@
require => Class['::redis::client::python'],
}
- file { '/etc/init/proxylistener.conf':
- ensure => file,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/toollabs/proxylistener.conf',
+ base::service_unit { 'proxylistener':
+ ensure => present,
+ upstart => true
+ systemd => true,
require => File['/usr/local/sbin/proxylistener'],
- }
-
- service { 'proxylistener':
- ensure => running,
- require => File['/etc/init/proxylistener.conf'],
}
ferm::service { 'proxylistener-port':
diff --git a/modules/toollabs/templates/initscripts/proxylistener.systemd.erb
b/modules/toollabs/templates/initscripts/proxylistener.systemd.erb
new file mode 100644
index 0000000..44ae0c7
--- /dev/null
+++ b/modules/toollabs/templates/initscripts/proxylistener.systemd.erb
@@ -0,0 +1,8 @@
+[Unit]
+Description=ProxyListener
+
+[Service]
+ExecStart=/usr/local/sbin/proxylistener
+
+[Install]
+WantedBy=multi-user.target
diff --git a/modules/toollabs/files/proxylistener.conf
b/modules/toollabs/templates/initscripts/proxylistener.upstart.erb
similarity index 100%
rename from modules/toollabs/files/proxylistener.conf
rename to modules/toollabs/templates/initscripts/proxylistener.upstart.erb
--
To view, visit https://gerrit.wikimedia.org/r/242443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28e95bde72b48255d2326afdacdd1732055e3f25
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
