Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284293
Change subject: ircserver: add systemd unit file and conditionals
......................................................................
ircserver: add systemd unit file and conditionals
If on jessie, add a (missing) systemd unit file, else add the existing
upstart init script.
Bug:T123729
Change-Id: I629c2a2c00f8525813d79a0d3a33c859d22212b0
---
A modules/mw_rc_irc/files/systemd/ircd.service
M modules/mw_rc_irc/manifests/ircserver.pp
2 files changed, 28 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/284293/1
diff --git a/modules/mw_rc_irc/files/systemd/ircd.service
b/modules/mw_rc_irc/files/systemd/ircd.service
new file mode 100644
index 0000000..77a87d9
--- /dev/null
+++ b/modules/mw_rc_irc/files/systemd/ircd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=IRCd for Mediawiki RecentChanges feed
+After=network.target
+
+[Service]
+User=irc
+Group=irc
+WorkingDirectory=/var/lib/gitblit
+ExecStart=/usr/bin/ircd -foreground
+[Install]
+WantedBy=multi-user.target
diff --git a/modules/mw_rc_irc/manifests/ircserver.pp
b/modules/mw_rc_irc/manifests/ircserver.pp
index 575e9c8..ba249c2 100644
--- a/modules/mw_rc_irc/manifests/ircserver.pp
+++ b/modules/mw_rc_irc/manifests/ircserver.pp
@@ -16,14 +16,29 @@
owner => 'irc',
group => 'irc',
content => template('mw_rc_irc/motd.erb');
- '/etc/init/ircd.conf':
- source => 'puppet:///modules/mw_rc_irc/upstart/ircd.conf',
}
if os_version('debian >= jessie') {
+
$ircd_provider = 'systemd'
+
+ file { '/etc/systemd/system/ircd.service':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/mw_rc_irc/systemd/ircd.service',
+ }
+
} else {
+
$ircd_provider = 'upstart'
+
+ file { '/etc/init/ircd.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/mw_rc_irc/upstart/ircd.conf',
+ }
}
service { 'ircd':
--
To view, visit https://gerrit.wikimedia.org/r/284293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I629c2a2c00f8525813d79a0d3a33c859d22212b0
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
