Merge ~tcuthbert/container-log-archive-charm:master into container-log-archive-charm:master

[Thomas Cuthbert]

Ensure that when we install the logrotate config we also initialise the logfile with the correct permissions

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

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

[Stuart Bishop (stub)]

This looks fine.

review: Approve

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

Change successfully merged at revision d46f03a00a338068588e2e00da9304619e4f6f6c

diff --git a/files/container-log-archive.logrotate b/files/container-log-archive.logrotate
index 5dd38b0..ae743eb 100644
--- a/files/container-log-archive.logrotate
+++ b/files/container-log-archive.logrotate
@@ -8,5 +8,5 @@
     compress
     notifempty
     missingok
-    create 0644 root root
+    create 0664 root log-archive
 }
diff --git a/hooks/hooks.py b/hooks/hooks.py
index 0d36c77..fed7a0c 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -3,12 +3,13 @@
 # Copyright 2014 Canonical Ltd.  All rights reserved
 # Author: Chris Stratford <[e-mail]>
 
-import sys
-import random
+import grp
 import os
-import stat
 import os.path
+import random
 import shutil
+import stat
+import sys
 import socket
 import time
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
@@ -263,9 +264,16 @@ def deconfigure_nrpe():
 
 
 def configure_logrotate():
+    log_path = "/var/log/container-log-archive.log"
     logrotate_etcdir = "/etc/logrotate.d"
     logrotate_file = "files/container-log-archive.logrotate"
     logrotate_path = os.path.join(logrotate_etcdir, "container-log-archive")
+    # Initialise the log file with the correct permissions
+    with open(log_path, "w"):
+        pass
+    os.chmod(log_path, "0o664")
+    gid = grp.getgrgid("log-archive")
+    os.chown(log_path, "root", gid)
     try:
         shutil.copyfile(logrotate_file, logrotate_path)
     except OSError as e: