Ottomata has submitted this change and it was merged.
Change subject: Add rsyslog configuration only if Service['rsyslog'] has been
defined.
......................................................................
Add rsyslog configuration only if Service['rsyslog'] has been defined.
Bug: T129344
Change-Id: I5e36c44c2cc8ad267983fb018e452831c50b4b38
---
M manifests/init.pp
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/init.pp b/manifests/init.pp
index 4b7d301..cd98f37 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -29,11 +29,14 @@
}
# Basic rsyslog.d configuration to create /var/log/varnishkafka.log
- file { '/etc/rsyslog.d/70-varnishkafka.conf':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/varnishkafka/varnishkafka_rsyslog.conf'
+ if defined(Service['rsyslog']) {
+ file { '/etc/rsyslog.d/70-varnishkafka.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source =>
'puppet:///modules/varnishkafka/varnishkafka_rsyslog.conf',
+ notify => Service['rsyslog']
+ }
}
# Since we are doing per instance stats.json files, the logrotate
--
To view, visit https://gerrit.wikimedia.org/r/280690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e36c44c2cc8ad267983fb018e452831c50b4b38
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/varnishkafka
Gerrit-Branch: master
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
