[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsyslog: fully port receiver to jessie

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: rsyslog: fully port receiver to jessie
......................................................................


rsyslog: fully port receiver to jessie

lithium will be reinstalled with jessie and wezen already runs on jessie

Change-Id: I81681558d1d21330a8879005b366e063e6b7740b
---
M modules/rsyslog/manifests/receiver.pp
M modules/rsyslog/templates/receiver_logrotate.erb.conf
2 files changed, 3 insertions(+), 9 deletions(-)

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



diff --git a/modules/rsyslog/manifests/receiver.pp 
b/modules/rsyslog/manifests/receiver.pp
index 462f384..07226fe 100644
--- a/modules/rsyslog/manifests/receiver.pp
+++ b/modules/rsyslog/manifests/receiver.pp
@@ -29,12 +29,6 @@
         fail("rsyslog log and archive are the same: ${log_directory}")
     }
 
-    if os_version('debian >= jessie') {
-        $rsyslog_user = 'root'
-    } else {
-        $rsyslog_user = 'syslog'
-    }
-
     rsyslog::conf { 'receiver':
         content  => template("${module_name}/receiver.erb.conf"),
         priority => 10,
@@ -58,14 +52,14 @@
 
     file { $log_directory:
         ensure => directory,
-        owner  => $rsyslog_user,
+        owner  => 'root',
         group  => 'root',
         mode   => '0755',
     }
 
     file { $archive_directory:
         ensure => directory,
-        owner  => $rsyslog_user,
+        owner  => 'root',
         group  => 'root',
         mode   => '0755',
     }
diff --git a/modules/rsyslog/templates/receiver_logrotate.erb.conf 
b/modules/rsyslog/templates/receiver_logrotate.erb.conf
index a5465f3..d6c026b 100644
--- a/modules/rsyslog/templates/receiver_logrotate.erb.conf
+++ b/modules/rsyslog/templates/receiver_logrotate.erb.conf
@@ -13,6 +13,6 @@
   notifempty
   sharedscripts
   postrotate
-    invoke-rc.d rsyslog reload >/dev/null 2>&1 || true
+    invoke-rc.d rsyslog rotate >/dev/null
   endscript
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81681558d1d21330a8879005b366e063e6b7740b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits