Merge remote-tracking branch 'immerda/master' into merge_immerda

Conflicts:
	manifests/plugins/interfaces.pp

$real_ifs was changed on master and we'd like to keep that change

$ifs was changed to use the prefix() function and we'd like to keep that
change.

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
-}