diff --git a/roles/munin/tasks/enable-or-disable.yml b/roles/munin/tasks/enable-or-disable.yml deleted file mode 100644 index ad19227d2..000000000 --- a/roles/munin/tasks/enable-or-disable.yml +++ /dev/null @@ -1,50 +0,0 @@ -- name: Enable & Start 'munin-node' systemd service - systemd: - name: munin-node - daemon_reload: yes - enabled: yes - state: started - when: munin_enabled | bool - -- name: Disable 'munin-node' systemd service - systemd: - name: munin-node - enabled: no - state: stopped - when: not munin_enabled - -# Apache - -- name: Enable http://box/munin via Apache - command: a2ensite munin24.conf - when: apache_install and munin_enabled # and not nginx_enabled - -- name: Disable http://box/munin via Apache - command: a2dissite munin24.conf - when: apache_install and not munin_enabled # or nginx_enabled - -- name: Restart Apache systemd service ({{ apache_service }}) - systemd: - name: "{{ apache_service }}" # apache2 or httpd, as set in /opt/iiab/iiab/vars/.yml - state: restarted - when: apache_install and apache_enabled - -# NGINX - -- name: Enable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf from template - template: - src: munin24-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d - when: munin_enabled # and nginx_enabled - -- name: Disable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf - file: - path: "{{ nginx_config_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d - state: absent - when: not munin_enabled - -- name: Restart 'nginx' systemd service - systemd: - name: nginx - state: restarted - # when: nginx_enabled | bool diff --git a/roles/munin/tasks/nginx.yml b/roles/munin/tasks/nginx.yml new file mode 100644 index 000000000..cbe4286bc --- /dev/null +++ b/roles/munin/tasks/nginx.yml @@ -0,0 +1,16 @@ +- name: Enable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf from template + template: + src: munin24-nginx.conf.j2 + dest: "{{ nginx_config_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d + when: munin_enabled + +- name: Disable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf + file: + path: "{{ nginx_config_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d + state: absent + when: not munin_enabled + +- name: Restart 'nginx' systemd service + systemd: + name: nginx + state: restarted