Merge branch 'merge_immerda' into 'master'

This is my attempt at merging the huge backlog of commits from immerda. I've been pretty verbose about it in redmine so I won't repeat it all here. For details, see:

https://labs.riseup.net/code/issues/4132

1 files changed, 0 insertions, 35 deletions

diff --git a/files/config/host/logrotate.Debian b/files/config/host/logrotate.Debian
deleted file mode 100644
index 732c871..0000000
--- a/files/config/host/logrotate.Debian
+++ /dev/null
@@ -1,35 +0,0 @@
-/var/log/munin/munin-update.log {
-        daily
-        missingok
-        rotate 7
-        compress
-        notifempty
-        create 640 munin adm
-}
-
-/var/log/munin/munin-graph.log {
-        daily
-        missingok
-        rotate 7
-        compress
-        notifempty
-        create 660 munin www-data
-}
-
-/var/log/munin/munin-html.log {
-        daily
-        missingok
-        rotate 7
-        compress
-        notifempty
-        create 640 munin adm
-}
-
-/var/log/munin/munin-limits.log {
-        daily
-        missingok
-        rotate 7
-        compress
-        notifempty
-        create 640 munin adm
-}