Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284343
Change subject: ircserver: fix dependencies for running on jessie
......................................................................
ircserver: fix dependencies for running on jessie
If on jessie and systemd we don't install the upstart init script
and this resource dependency breaks. Set it accordingly on each
system.
Bug:T123729
Change-Id: I6bfcca985ef3ad3dcb79dafba525fea1cca6bb4d
---
M modules/mw_rc_irc/manifests/ircserver.pp
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/284343/1
diff --git a/modules/mw_rc_irc/manifests/ircserver.pp
b/modules/mw_rc_irc/manifests/ircserver.pp
index 3f6a0ad..7e7aa0c 100644
--- a/modules/mw_rc_irc/manifests/ircserver.pp
+++ b/modules/mw_rc_irc/manifests/ircserver.pp
@@ -21,6 +21,7 @@
if os_version('debian >= jessie') {
$ircd_provider = 'systemd'
+ $ircd_require = '/etc/systemd/system/ircd.service'
file { '/etc/systemd/system/ircd.service':
owner => 'root',
@@ -32,6 +33,7 @@
} else {
$ircd_provider = 'upstart'
+ $ircd_require = '/etc/init/ircd.conf'
file { '/etc/init/ircd.conf':
source => 'puppet:///modules/mw_rc_irc/upstart/ircd.conf',
@@ -41,7 +43,7 @@
service { 'ircd':
ensure => running,
provider => $ircd_provider,
- require => File['/etc/init/ircd.conf'],
+ require => File[$ircd_require],
}
diamond::collector { 'IRCDStats':
--
To view, visit https://gerrit.wikimedia.org/r/284343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bfcca985ef3ad3dcb79dafba525fea1cca6bb4d
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
