Cmjohnson has submitted this change and it was merged.
Change subject: puppetizing /etc/lograte.d/squid
......................................................................
puppetizing /etc/lograte.d/squid
Change-Id: I95108b17d32dc47a46b81e4c310d586a6c38fe37
---
A files/logrotate/squid
M manifests/misc/install-server.pp
2 files changed, 32 insertions(+), 0 deletions(-)
Approvals:
ArielGlenn: Looks good to me, but someone else must approve
Cmjohnson: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/logrotate/squid b/files/logrotate/squid
new file mode 100644
index 0000000..fc12a62
--- /dev/null
+++ b/files/logrotate/squid
@@ -0,0 +1,22 @@
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+### puppet:///files/logrotate/squid
+#####################################################################
+#
+# Logrotate fragment for squid.
+#
+/var/log/squid/*.log {
+ daily
+ compress
+ size 300M
+ rotate 0
+ missingok
+ nocreate
+ sharedscripts
+ prerotate
+ test ! -x /usr/sbin/sarg-reports || /usr/sbin/sarg-reports
+ endscript
+ postrotate
+ test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate
+ endscript
+}
diff --git a/manifests/misc/install-server.pp b/manifests/misc/install-server.pp
index 5f10979..993ad9d 100644
--- a/manifests/misc/install-server.pp
+++ b/manifests/misc/install-server.pp
@@ -97,6 +97,16 @@
ensure => present;
}
+ file { "/etc/logrotate.d/squid":
+ require => Package[squid],
+ mode => 0444,
+ owner => root,
+ group => root,
+ path => "/etc/logrotate.d/squid",
+ source => "puppet:///files/logrotate/squid",
+ ensure => present;
+ }
+
# pin package to the default, Ubuntu version, instead of our own
apt::pin { [ 'squid', 'squid-common', 'squid-langpack' ]:
pin => 'release o=Ubuntu',
--
To view, visit https://gerrit.wikimedia.org/r/78965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95108b17d32dc47a46b81e4c310d586a6c38fe37
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
