diff --git a/apache/tasks/munin.yml b/apache/tasks/munin.yml
index ce560868..2850b101 100644
--- a/apache/tasks/munin.yml
+++ b/apache/tasks/munin.yml
@@ -2,13 +2,20 @@
- name: install packages for Apache and Munin
apt:
- name: libapache2-mod-fcgid
+ name: "{{ item }}"
state: installed
+ with_items:
+ - libapache2-mod-fcgid
+ - libcgi-fast-perl
notify: reload apache
tags:
- apache
- munin
+- name: change group for /var/log/munin/
+ file:
+ group: www-data
+
- name: install munin plugins
file:
src: "/etc/munin/plugins/{{ item }}"
diff --git a/apache/templates/evolinux-default.conf.j2 b/apache/templates/evolinux-default.conf.j2
index 36ae65ad..105edeb1 100644
--- a/apache/templates/evolinux-default.conf.j2
+++ b/apache/templates/evolinux-default.conf.j2
@@ -47,29 +47,12 @@
Require all denied
Include /etc/apache2/private_ipaddr_whitelist.conf
-
- Options -Indexes
- Require all denied
- Include /etc/apache2/private_ipaddr_whitelist.conf
-
-
- # Munin cgi
- # Ensure we can run (fast)cgi scripts
+ # munin-cgi-graph, used for zooming on graphs.
ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
Options +ExecCGI
-
- SetHandler fcgid-script
-
-
- SetHandler fastcgi-script
-
-
-
- SetHandler cgi-script
-
-
- Allow from all
+ Require all denied
+ Include /etc/apache2/private_ipaddr_whitelist.conf
# For CGI Scripts. We need to set Directory directive as ScriptAlias take precedence.