Merge ~hloeung/container-log-archive-charm:fixes into container-log-archive-charm:master

[Haw Loeung]

Set correct ownership and group for log files - LP:1949803

[🤖 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 2d8783355324f5b87e6e1aa0634b216ea38cd0f2

diff --git a/hooks/hooks.py b/hooks/hooks.py
index f9ac138..e71de24 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -3,11 +3,11 @@
 # Copyright 2014 Canonical Ltd.  All rights reserved
 # Author: Chris Stratford <[e-mail]>
 
+import grp
 import os
 import os.path
 import pwd
 import random
-import shutil
 import stat
 import sys
 import socket
@@ -259,7 +259,6 @@ 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"):
@@ -268,14 +267,17 @@ def configure_logrotate():
     try:
         r = pwd.getpwnam(conf.archive_username())
         gid = r.pw_gid
+        group = grp.getgrgid(gid).gr_name
     except KeyError:
         gid = 0
+        group = 'root'
     os.chown(log_path, 0, gid)
-    try:
-        shutil.copyfile(logrotate_file, logrotate_path)
-    except OSError as e:
-        log("CHARM: Failed to copy logrotate file {} to {}".format(logrotate_file, logrotate_path))
-        raise(e)
+
+    tmpl_data = {}
+    tmpl_data["username"] = conf.archive_username()
+    tmpl_data["group"] = group
+    file_from_template("logrotate.tmpl", logrotate_path, tmpl_data)
+    log("CHARM: Wrote logrotate file {}".format(logrotate_path))
 
 
 def remove_legacy_files():
diff --git a/files/container-log-archive.logrotate b/templates/logrotate.tmpl
similarity index 76%
rename from files/container-log-archive.logrotate
rename to templates/logrotate.tmpl
index ae743eb..23f0f09 100644
--- a/files/container-log-archive.logrotate
+++ b/templates/logrotate.tmpl
@@ -1,6 +1,3 @@
-#-------------------------------------------------#
-# This file is Juju managed - do not edit by hand #
-#-------------------------------------------------#
 /var/log/container-log-archive.log {
     rotate 7
     daily
@@ -8,5 +5,5 @@
     compress
     notifempty
     missingok
-    create 0664 root log-archive
+    create 0664 {{username}} {{group}}
 }