ff

playbooks/3_service/munin.yml

@@ -1,27 +1,8 @@
 ---
 - hosts: munin
   roles:
-    - role: ansible-role-apache
-      tags: "apache"
-      become: true
     - role: ansible-role-munin
       tags: "munin"
       become: true
-  post_tasks:
-    - name: ensure vhost symlink exists
-      become: true
-      ansible.builtin.file:
-        src: /var/cache/munin/www
-        dest: /var/www/html/munin.mgrote.net
-        owner: root
-        group: root
-        state: link
 
-    - name: ensure apache.conf symlink exists
-      become: true
-      ansible.builtin.file:
-        src: /etc/munin/apache24.conf
-        dest: /var/www/html/munin.mgrote.net
-        owner: root
-        group: root
-        state: link
+# TODO beide alten rollen weg

roles/mgrote_munin_server/dd

@@ -1,39 +0,0 @@
-DirectoryIndex index.php index.html
-
-<VirtualHost *:80>
-    ServerName munin.mgrote.net
-    ServerAlias munin
-
-    ServerAdmin  info@mgrote.net
-
-    DocumentRoot /var/www/html/munin.mgrote.net
-
-    ErrorLog  /var/log/apache2/munin.mgrote.net-error.log
-    CustomLog /var/log/apache2/munin.mgrote.net-access.log combined
-
-    # Rewrites
-    RewriteEngine On
-
-    # Static content in /static
-    RewriteRule ^/favicon.ico /etc/munin/static/favicon.ico [L]
-    RewriteRule ^/static/(.*) /etc/munin/static/$1          [L]
-
-    # HTML
-    RewriteCond %{REQUEST_URI} .html$ [or]
-    RewriteCond %{REQUEST_URI} =/
-    RewriteRule ^/(.*)          /usr/lib/munin/cgi/munin-cgi-html/$1 [L]
-
-    # Images
-    RewriteRule ^/munin-cgi/munin-cgi-graph/(.*) /usr/lib/munin/cgi/munin-cgi-graph/$1 [L]
-
-    # Ensure we can run (fast)cgi scripts
-    <Directory "/usr/lib/munin/cgi">
-        Options +ExecCGI
-        <IfModule mod_fcgid.c>
-            SetHandler fcgid-script
-        </IfModule>
-        <IfModule !mod_fcgid.c>
-            SetHandler cgi-script
-        </IfModule>
-    </Directory>
-</VirtualHost>