Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385994 )
Change subject: graphite: Use systemd::tmpfile
......................................................................
graphite: Use systemd::tmpfile
Change-Id: I05d07ad501d3b005f3a5f5666013e33efc77993b
---
M modules/graphite/manifests/init.pp
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 3e2f77b..37e3566 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -159,12 +159,8 @@
# create required directory in /run at reboot, don't wait for a puppet
# run to fix it
- file { '/usr/lib/tmpfiles.d/graphite.conf':
- ensure => present,
- mode => '0444',
+ systemd::tmpfile { 'graphite':
content => 'd /var/run/carbon 0755 _graphite _graphite',
- owner => 'root',
- group => 'root',
}
rsyslog::conf { 'graphite':
--
To view, visit https://gerrit.wikimedia.org/r/385994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05d07ad501d3b005f3a5f5666013e33efc77993b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits