Merge lp:~hloeung/ubuntu-repository-cache/squid-logrotate into lp:ubuntu-repository-cache

[Haw Loeung]

Fix squid/squid-deb-proxy log retention - LP:1912131

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Barry Price (barryprice)]

LGTM +1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 300

=== modified file 'lib/ubuntu_repository_cache/service.py'
--- lib/ubuntu_repository_cache/service.py	2020-10-13 04:38:51 +0000
+++ lib/ubuntu_repository_cache/service.py	2021-02-01 02:01:01 +0000
@@ -247,13 +247,15 @@
     squid.render_configs()
 
     # Log file rotation
-    logrotate_filename = '/etc/logrotate.d/apache2'
-    logrotate_context = {
-        'logrotate_rotate': config['logrotate_rotate'],
-        'logrotate_count': config['logrotate_count'],
-        'logrotate_dateext': config['logrotate_dateext'],
-    }
-    templating.render('logrotate/logrotate.conf.template', logrotate_filename, logrotate_context, perms=0o644)
+    for service in ['apache2', 'squid', 'squid-deb-proxy', 'ubuntu-repository-sync']:
+        logrotate_filename = '/etc/logrotate.d/{}'.format(service)
+        logrotate_template = 'logrotate/{}-logrotate.conf.tmpl'.format(service)
+        logrotate_context = {
+            'logrotate_rotate': config['logrotate_rotate'],
+            'logrotate_count': config['logrotate_count'],
+            'logrotate_dateext': config['logrotate_dateext'],
+        }
+        templating.render(logrotate_template, logrotate_filename, logrotate_context, perms=0o644)
 
     if not os.path.exists(CONFIG_DIR):
         host.mkdir(CONFIG_DIR)

=== renamed file 'templates/logrotate/logrotate.conf.template' => 'templates/logrotate/apache2-logrotate.conf.tmpl'
--- templates/logrotate/logrotate.conf.template	2020-10-13 03:41:08 +0000
+++ templates/logrotate/apache2-logrotate.conf.tmpl	2021-02-01 02:01:01 +0000
@@ -1,36 +1,25 @@
 # This file is managed by Juju. Do not make local changes
 
 /var/log/apache2/*.log {
-        {{ logrotate_rotate }}
-{%- if logrotate_dateext %}
-        dateext
-{%- endif %}
-        missingok
-        rotate {{ logrotate_count }}
-        compress
-        delaycompress
-        notifempty
-        create 640 root adm
-        sharedscripts
-        postrotate
-                /etc/init.d/apache2 reload > /dev/null
-        endscript
-        prerotate
-                if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
-                        run-parts /etc/logrotate.d/httpd-prerotate; \
-                fi; \
-        endscript
-}
-
-/var/log/repository-sync/repository-sync-cron.log {
-        {{ logrotate_rotate }}
-{%- if logrotate_dateext %}
-        dateext
-{%- endif %}
-        rotate {{ logrotate_count }}
-        missingok
-        compress
-        delaycompress
-        notifempty
-        create 640 www-sync adm
+	{{ logrotate_rotate }}
+{%- if logrotate_dateext %}
+	dateext
+{%- endif %}
+	missingok
+	rotate {{ logrotate_count }}
+	compress
+	delaycompress
+	notifempty
+	create 640 root adm
+	sharedscripts
+	postrotate
+                if invoke-rc.d apache2 status > /dev/null 2>&1; then \
+                    invoke-rc.d apache2 reload > /dev/null 2>&1; \
+                fi;
+	endscript
+	prerotate
+		if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
+			run-parts /etc/logrotate.d/httpd-prerotate; \
+		fi; \
+	endscript
 }

=== added file 'templates/logrotate/squid-deb-proxy-logrotate.conf.tmpl'
--- templates/logrotate/squid-deb-proxy-logrotate.conf.tmpl	1970-01-01 00:00:00 +0000
+++ templates/logrotate/squid-deb-proxy-logrotate.conf.tmpl	2021-02-01 02:01:01 +0000
@@ -0,0 +1,24 @@
+# This file is managed by Juju. Do not make local changes
+
+/var/log/squid-deb-proxy/*.log {
+ {{ logrotate_rotate }}
+{%- if logrotate_dateext %}
+ dateext
+{%- endif %}
+ missingok
+ rotate {{ logrotate_count }}
+ compress
+ delaycompress
+ nocreate
+ sharedscripts
+ postrotate
+  if [ -x /usr/sbin/squid ]; then
+      SQUID=/usr/sbin/squid
+  else
+      echo "No squid binary found"
+      exit 1
+  fi
+
+  test ! -e /var/run/squid-deb-proxy.pid || $SQUID -f /etc/squid-deb-proxy/squid-deb-proxy.conf -k rotate
+ endscript
+}

=== added file 'templates/logrotate/squid-logrotate.conf.tmpl'
--- templates/logrotate/squid-logrotate.conf.tmpl	1970-01-01 00:00:00 +0000
+++ templates/logrotate/squid-logrotate.conf.tmpl	2021-02-01 02:01:01 +0000
@@ -0,0 +1,21 @@
+# This file is managed by Juju. Do not make local changes
+
+/var/log/squid/*.log {
+	{{ logrotate_rotate }}
+{%- if logrotate_dateext %}
+	dateext
+{%- endif %}
+	missingok
+	rotate {{ logrotate_count }}
+	compress
+	delaycompress
+	notifempty
+	nocreate
+	sharedscripts
+	prerotate
+		test ! -x /usr/sbin/sarg-reports || /usr/sbin/sarg-reports daily
+	endscript
+	postrotate
+		test ! -e /var/run/squid.pid || test ! -x /usr/sbin/squid || /usr/sbin/squid -k rotate
+	endscript
+}

=== added file 'templates/logrotate/ubuntu-repository-sync-logrotate.conf.tmpl'
--- templates/logrotate/ubuntu-repository-sync-logrotate.conf.tmpl	1970-01-01 00:00:00 +0000
+++ templates/logrotate/ubuntu-repository-sync-logrotate.conf.tmpl	2021-02-01 02:01:01 +0000
@@ -0,0 +1,14 @@
+# This file is managed by Juju. Do not make local changes
+
+/var/log/repository-sync/repository-sync-cron.log {
+        {{ logrotate_rotate }}
+{%- if logrotate_dateext %}
+        dateext
+{%- endif %}
+        rotate {{ logrotate_count }}
+        missingok
+        compress
+        delaycompress
+        notifempty
+        create 640 www-sync adm
+}