Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349186 )
Change subject: tcpircbot: Subscribe to the correct File resource
......................................................................
tcpircbot: Subscribe to the correct File resource
tcpircbot would not restart on a config change due to subscribing to an
incorrect (old) File resource. Fix the subscription and remove the old
init and configuration file resources.
Change-Id: I0ab2f86fe718ff8250754012e039438c68350e77
---
M modules/tcpircbot/manifests/instance.pp
1 file changed, 1 insertion(+), 8 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/tcpircbot/manifests/instance.pp
b/modules/tcpircbot/manifests/instance.pp
index 1f0c2ac..baac6a1 100644
--- a/modules/tcpircbot/manifests/instance.pp
+++ b/modules/tcpircbot/manifests/instance.pp
@@ -68,9 +68,6 @@
$listen_port = 9200,
) {
include tcpircbot
- file { "${tcpircbot::dir}/${title}.json":
- ensure => absent,
- }
file { "${tcpircbot::dir}/tcpircbot-${title}.json":
ensure => present,
@@ -81,16 +78,12 @@
require => User['tcpircbot'],
}
- file { "/etc/init.d/tcpircbot-${title}":
- ensure => absent,
- }
-
base::service_unit { "tcpircbot-${title}":
ensure => present,
upstart => true,
systemd => true,
template_name => 'tcpircbot',
- subscribe => File["${tcpircbot::dir}/${title}.json"],
+ subscribe => File["${tcpircbot::dir}/tcpircbot-${title}.json"],
require => [
Package['python-irclib'],
File["${tcpircbot::dir}/${title}.json"],
--
To view, visit https://gerrit.wikimedia.org/r/349186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ab2f86fe718ff8250754012e039438c68350e77
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
