Merge ~cjwatson/launchpad:charm-librarian-fixes into launchpad:master

[Colin Watson]

charm: Fix a couple of bugs preventing the librarian from working

[Simone Pelosi (pelpsi)]

LGTM!

review: Approve

diff --git a/charm/launchpad-librarian/reactive/launchpad-librarian.py b/charm/launchpad-librarian/reactive/launchpad-librarian.py
index 6b4dda7..349f22a 100644
--- a/charm/launchpad-librarian/reactive/launchpad-librarian.py
+++ b/charm/launchpad-librarian/reactive/launchpad-librarian.py
@@ -39,6 +39,12 @@ def configure_systemd(config):
         "/lib/systemd/system/launchpad-librarian@.service",
         config,
     )
+    templating.render(
+        "launchpad-librarian-generator.j2",
+        "/lib/systemd/system-generators/launchpad-librarian-generator",
+        config,
+        perms=0o555,
+    )
     subprocess.run(["systemctl", "daemon-reload"])
 
 
diff --git a/charm/launchpad-librarian/templates/logrotate.conf.j2 b/charm/launchpad-librarian/templates/logrotate.conf.j2
index 66e2b12..42c1d4d 100644
--- a/charm/launchpad-librarian/templates/logrotate.conf.j2
+++ b/charm/launchpad-librarian/templates/logrotate.conf.j2
@@ -7,8 +7,7 @@
     compress
     notifempty
     missingok
-    create 0644 syslog adm
-    sharedscripts
+    create 0644 launchpad launchpad
     postrotate
         systemctl reload launchpad-librarian.service
     endscript
@@ -23,6 +22,5 @@
     compress
     notifempty
     missingok
-    create 0644 syslog adm
 }