Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120211
Change subject: install-server fix logrotate for squid3
......................................................................
install-server fix logrotate for squid3
Fix squid3's logrotate to check for the right pidfile. Additionally,
place the logrotate under /etc/logrotate.d/squid3, instead of squid, as
the packaage provides squid3 and having both results in "duplicate log
entry" cronspams.
Change-Id: I274b0fb8ef79dbc68d501a9f39e1de7d52002aff
---
M modules/install-server/files/squid3-logrotate
M modules/install-server/manifests/caching-proxy.pp
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/120211/1
diff --git a/modules/install-server/files/squid3-logrotate
b/modules/install-server/files/squid3-logrotate
index ab8b0ae..a8131e1 100644
--- a/modules/install-server/files/squid3-logrotate
+++ b/modules/install-server/files/squid3-logrotate
@@ -2,7 +2,7 @@
### THIS FILE IS MANAGED BY PUPPET
#####################################################################
#
-# Logrotate fragment for squid.
+# Logrotate fragment for squid3.
#
/var/log/squid3/*.log {
daily
@@ -16,6 +16,6 @@
test ! -x /usr/sbin/sarg-reports || /usr/sbin/sarg-reports
endscript
postrotate
- test ! -e /var/run/squid.pid || /usr/sbin/squid3 -k rotate
+ test ! -e /var/run/squid3.pid || /usr/sbin/squid3 -k rotate
endscript
}
diff --git a/modules/install-server/manifests/caching-proxy.pp
b/modules/install-server/manifests/caching-proxy.pp
index 6304aa4..6830afd 100644
--- a/modules/install-server/manifests/caching-proxy.pp
+++ b/modules/install-server/manifests/caching-proxy.pp
@@ -32,7 +32,7 @@
source =>
"puppet:///modules/install-server/${package_name}-apt-proxy.conf",
}
- file { '/etc/logrotate.d/squid':
+ file { "/etc/logrotate.d/${package_name}":
ensure => present,
require => Package[$package_name],
mode => '0444',
--
To view, visit https://gerrit.wikimedia.org/r/120211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I274b0fb8ef79dbc68d501a9f39e1de7d52002aff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
