Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284273
Change subject: ircserver/irc_echo: use systemd provider if on jessie
......................................................................
ircserver/irc_echo: use systemd provider if on jessie
On jessie: "Provider upstart is not functional on this host",
use systemd when on jessie, for both IRC server and IRC bot.
Bug:T123729
Change-Id: Ia760e944ab47c68cbdd78bc093b258bfdbf8bb74
---
M modules/mw_rc_irc/manifests/irc_echo.pp
M modules/mw_rc_irc/manifests/ircserver.pp
2 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/284273/1
diff --git a/modules/mw_rc_irc/manifests/irc_echo.pp
b/modules/mw_rc_irc/manifests/irc_echo.pp
index 3535c9f..2b274b6 100644
--- a/modules/mw_rc_irc/manifests/irc_echo.pp
+++ b/modules/mw_rc_irc/manifests/irc_echo.pp
@@ -18,10 +18,16 @@
require => File['/usr/local/bin/udpmxircecho.py'],
}
+ if os_version('debian >= jessie') {
+ $ircecho_provider = 'systemd'
+ } else {
+ $ircecho_provider = 'upstart'
+ }
+
# Ensure that the service is running.
service { 'ircecho':
ensure => running,
- provider => 'upstart',
+ provider => $ircecho_provider,
require => File['/etc/init/ircecho.conf'],
}
}
diff --git a/modules/mw_rc_irc/manifests/ircserver.pp
b/modules/mw_rc_irc/manifests/ircserver.pp
index 0bf370d..575e9c8 100644
--- a/modules/mw_rc_irc/manifests/ircserver.pp
+++ b/modules/mw_rc_irc/manifests/ircserver.pp
@@ -20,9 +20,15 @@
source => 'puppet:///modules/mw_rc_irc/upstart/ircd.conf',
}
+ if os_version('debian >= jessie') {
+ $ircd_provider = 'systemd'
+ } else {
+ $ircd_provider = 'upstart'
+ }
+
service { 'ircd':
ensure => running,
- provider => 'upstart',
+ provider => $ircd_provider,
require => File['/etc/init/ircd.conf'],
}
--
To view, visit https://gerrit.wikimedia.org/r/284273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia760e944ab47c68cbdd78bc093b258bfdbf8bb74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
