mg/homeserver
1
0
Fork 0
Code Issues 1 Pull requests 3 Activity Actions

ff

Browse source
This commit is contained in:
Michael Grote 2024-08-12 12:53:37 +02:00
parent 7a057a5534
commit 69ad0dd5fa
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
roles/mgrote_munin_server/tasks/main.yml
View file

@ -5,18 +5,16 @@
name: "{{ munin_packages }}" name: "{{ munin_packages }}"
state: present state: present
- name: Copy apache24.conf - name: Template apache config
ansible.builtin.copy: ansible.builtin.template:
src: /etc/munin/apache24.conf src: /etc/munin/apache.conf
dest: /etc/apache2/sites-available/000-default.conf dest: /etc/apache2/sites-available/000-default.conf
remote_src: yes
(sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf) && \
(sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf) && \
(sed -i 's/Order allow,deny.*/Allow from all/g' /etc/apache2/sites-available/000-default.conf) && \
(mkdir -p /var/run/munin && \ (mkdir -p /var/run/munin && \
chown -R munin:munin /var/run/munin) && \ chown -R munin:munin /var/run/munin) && \
(chfn -f 'munin' root) && \ (chfn -f 'munin' root) && \
@ -32,7 +30,6 @@ RUN chmod +x /etc/munin/plugins/munin_stats && \
chmod +x /etc/munin/plugins/munin_update && \ chmod +x /etc/munin/plugins/munin_update && \
chmod +x /usr/local/bin/run chmod +x /usr/local/bin/run
COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
COPY logrotate-munin /etc/logrotate.d/munin COPY logrotate-munin /etc/logrotate.d/munin
COPY munin.conf /etc/munin/munin.conf COPY munin.conf /etc/munin/munin.conf
COPY munin-node.conf /etc/munin/munin-node.conf COPY munin-node.conf /etc/munin/munin-node.conf

9
roles/mgrote_munin_server/templates/000-default.conf → roles/mgrote_munin_server/templates/apache.conf
View file

@ -1,9 +1,8 @@
Documentroot /var/cache/munin/www Documentroot /var/cache/munin/www
ServerName localhost.localdomain ServerName {{ munin_servername }}
<Directory /var/cache/munin/www> <Directory /var/cache/munin/www>
Allow from all
Satisfy Any Satisfy Any
Options none Options none
<IfModule mod_expires.c> <IfModule mod_expires.c>
@ -12,9 +11,8 @@ ServerName localhost.localdomain
</IfModule> </IfModule>
</Directory> </Directory>
Alias /munin-cgi/ /usr/lib/munin/cgi/ Alias / /var/cache/munin/www/
<Directory /usr/lib/munin/cgi> <Directory /usr/lib/munin/cgi>
Allow from all
Satisfy Any Satisfy Any
Options +ExecCGI Options +ExecCGI
<IfModule mod_fcgid.c> <IfModule mod_fcgid.c>
@ -27,12 +25,10 @@ Alias /munin-cgi/ /usr/lib/munin/cgi/
<Location /munin-cgi> <Location /munin-cgi>
Allow from all
Satisfy Any Satisfy Any
</Location> </Location>
<Location /munin-cgi/munin-cgi-graph> <Location /munin-cgi/munin-cgi-graph>
Allow from all
Satisfy Any Satisfy Any
<IfModule mod_fcgid.c> <IfModule mod_fcgid.c>
SetHandler fcgid-script SetHandler fcgid-script
@ -43,7 +39,6 @@ Alias /munin-cgi/ /usr/lib/munin/cgi/
</Location> </Location>
<Location /munin-cgi/munin-cgi-html> <Location /munin-cgi/munin-cgi-html>
Allow from all
Satisfy Any Satisfy Any
<IfModule mod_fcgid.c> <IfModule mod_fcgid.c>
SetHandler fcgid-script SetHandler fcgid-script