Merge lp:~tcuthbert/charm-haproxy/trunk into lp:charm-haproxy

[Thomas Cuthbert]

Add custom logrotate configuration option, LP#1673011

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

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

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

Change successfully merged at revision 134

=== modified file 'config.yaml'
--- config.yaml	2019-05-17 14:20:57 +0000
+++ config.yaml	2019-06-07 09:24:54 +0000
@@ -94,6 +94,10 @@
     default: "queue 20000, client 50000, connect 5000, server 50000"
     type: string
     description: Default timeouts 
+  logrotate_config:
+    default: ""
+    type: string
+    description: Override package logrotate configuration.
   enable_monitoring:
     default: False
     type: boolean

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2019-05-17 14:38:23 +0000
+++ hooks/hooks.py	2019-06-07 09:24:54 +0000
@@ -52,6 +52,7 @@
 default_haproxy_lib_dir = "/var/lib/haproxy"
 metrics_cronjob_path = "/etc/cron.d/haproxy_metrics"
 metrics_script_path = "/usr/local/bin/haproxy_to_statsd.sh"
+log_rotate_config_path = "/etc/logrotate.d/haproxy"
 service_affecting_packages = ['haproxy']
 apt_backports_template = (
     "deb http://archive.ubuntu.com/ubuntu %(release)s-backports "
@@ -961,6 +962,9 @@
     ensure_package_status(service_affecting_packages, config_data['package_status'])
     enable_haproxy()
 
+    if config_data.get('logrotate_config'):
+        logrotate_configuration()
+
 
 def config_changed():
     config_data = config_get()
@@ -978,6 +982,9 @@
         else:
             raise ValueError('{} is not a valid port/proto value'.format(port_plus_proto))
 
+    if config_data.changed('logrotate_config'):
+        logrotate_configuration()
+
     old_stanzas = get_listen_stanzas()
     haproxy_globals = create_haproxy_globals()
     haproxy_userlists = create_haproxy_userlists()
@@ -1388,6 +1395,13 @@
                          user=monitoring_username)
 
 
+def logrotate_configuration():
+    config = config_get()
+    logrotate_config = config['logrotate_config']
+    with open(log_rotate_config_path, 'w') as f:
+        f.write(logrotate_config)
+
+
 # #############################################################################
 # Main section
 # #############################################################################