Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352658 )

Change subject: salt: use logrotate::conf for logrotate
......................................................................


salt: use logrotate::conf for logrotate

Change-Id: I56db810f588eb389c4a24b71d28dff376ce58e3d
---
M modules/salt/manifests/minion.pp
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/salt/manifests/minion.pp b/modules/salt/manifests/minion.pp
index c2a197b..26ac869 100644
--- a/modules/salt/manifests/minion.pp
+++ b/modules/salt/manifests/minion.pp
@@ -112,11 +112,9 @@
         }
     }
 
-    file { '/etc/logrotate.d/salt-common':
+    logrotate::conf { 'salt-common':
+        ensure => present,
         source => 'puppet:///modules/salt/logrotate.conf',
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0444',
     }
 
     if $::initsystem == 'systemd' {

-- 
To view, visit https://gerrit.wikimedia.org/r/352658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I56db810f588eb389c4a24b71d28dff376ce58e3d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to