Rush has submitted this change and it was merged.
Change subject: ircd: create upstart file and ensure running
......................................................................
ircd: create upstart file and ensure running
ircd did not survive a recent server reboot. There is a service 'ircd'
used in this puppet manifest but that service is not recognized on argon.
argon:/etc/init# service ircd status
ircd: unrecognized service
add upstart file and fix puppet manifest to ensure it gets started.
Bug:T87679
Change-Id: I5551922c7d634dcb78061aa6bcfff3280a1184c2
---
A modules/mw-rc-irc/files/upstart/ircd.conf
M modules/mw-rc-irc/manifests/ircserver.pp
2 files changed, 21 insertions(+), 2 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/modules/mw-rc-irc/files/upstart/ircd.conf
b/modules/mw-rc-irc/files/upstart/ircd.conf
new file mode 100644
index 0000000..f8ab406
--- /dev/null
+++ b/modules/mw-rc-irc/files/upstart/ircd.conf
@@ -0,0 +1,13 @@
+description "start and stop the ircd server"
+version "1"
+author "Daniel Zahn"
+
+setuid irc
+setgid irc
+
+start on startup
+stop on shutdown
+
+console log
+
+exec /usr/bin/ircd
diff --git a/modules/mw-rc-irc/manifests/ircserver.pp
b/modules/mw-rc-irc/manifests/ircserver.pp
index 1f073c0..3e2d0d6 100644
--- a/modules/mw-rc-irc/manifests/ircserver.pp
+++ b/modules/mw-rc-irc/manifests/ircserver.pp
@@ -18,10 +18,16 @@
content => template('mw-rc-irc/motd.erb');
}
+
+ file { '/etc/init/ircd.conf':
+ source => 'puppet:///modules/mw-rc-irc/upstart/ircd.conf',
+ require => File['/usr/bin/ircd'],
+ }
+
service { 'ircd':
ensure => running,
- provider => base,
- binary => '/usr/bin/ircd';
+ provider => 'upstart',
+ require => File['/etc/init/ircd.conf'],
}
diamond::collector { 'IRCDStats':
--
To view, visit https://gerrit.wikimedia.org/r/187059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5551922c7d634dcb78061aa6bcfff3280a1184c2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
