From d168219c29ce10a4c86a7cea968617656d8dd9a2 Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Tue, 22 Jan 2019 18:14:30 +0100 Subject: [PATCH] Drop Nagios support --- doc/freebsd.md | 1 - doc/site.md | 1 - .../etc/nginx/sites-available/_nagios3.j2 | 59 ------------------- tests/includes/post_Debian.yml | 6 -- tests/includes/post_FreeBSD.yml | 8 --- tests/test.yml | 35 ----------- vars/Debian.yml | 2 - vars/FreeBSD.yml | 1 - vars/main.yml | 1 - 9 files changed, 114 deletions(-) delete mode 100644 templates/etc/nginx/sites-available/_nagios3.j2 diff --git a/doc/freebsd.md b/doc/freebsd.md index 4fc9ae1..b493cb3 100644 --- a/doc/freebsd.md +++ b/doc/freebsd.md @@ -15,4 +15,3 @@ Sites not tested ---------------- - BackupPC -- Nagios diff --git a/doc/site.md b/doc/site.md index e506aa7..029ca18 100644 --- a/doc/site.md +++ b/doc/site.md @@ -42,7 +42,6 @@ Templates - `_backuppc`: access to [BackupPC](http://backuppc.sourceforge.net/) (be careful: you need to install [fcgiwrap](https://packages.debian.org/jessie/fcgiwrap)) - `_dokuwiki` - `_redirect`: should not be called explicitly -- `_nagios3`: access to Nagios3 (be careful: you need to install [fcgiwrap](https://packages.debian.org/jessie/fcgiwrap)) - `_phalcon`: Phalcon PHP Framework - `_php`: PHP base template. Can work with many frameworks/tools - `_php_index`: Same as above. But you can only run index.php diff --git a/templates/etc/nginx/sites-available/_nagios3.j2 b/templates/etc/nginx/sites-available/_nagios3.j2 deleted file mode 100644 index e5f22e6..0000000 --- a/templates/etc/nginx/sites-available/_nagios3.j2 +++ /dev/null @@ -1,59 +0,0 @@ -{% extends "_php.j2" %} - -{% block root %} - root {{ nginx_nagios_root }}; -{% endblock %} - -{% block template_try_files %} -{% endblock %} - -{% block template_index %} - index index.php index.html; -{% endblock %} - -{% block template_headers %} - # --> Custom headers -{% for key, value in __headers.iteritems() %} -{% if key == "X-Frame-Options" %} - # X-Frame-Options forced by Ansible - add_header {{ key }} "SAMEORIGIN"{% if nginx_version.stdout | version_compare('1.7.5', 'ge') %} always{% endif %}; -{% else %} - add_header {{ key }} "{{ value | replace(' always', '') }}"{% if nginx_version.stdout | version_compare('1.7.5', 'ge') and ' always' in value %} always{% endif %}; -{% endif %} -{% endfor %} - # <-- Custom headers -{% endblock %} - - -{% block template_local_content %} - location ~ /\.ht { - deny all; - } - - location /stylesheets { -{% if nginx_nagios_stylesheets is defined %} - alias {{ nginx_nagios_stylesheets }}; -{% endif %} - expires 60d; - } -{% endblock %} - -{% block template_upstream_location %} -{% if ansible_distribution == 'Debian' %} - location /cgi-bin/nagios3 { - root /usr/lib; -{% elif ansible_distribution == 'FreeBSD' %} - location /cgi-bin { -{% endif %} - try_files $uri =404; - include fastcgi.conf; - fastcgi_pass unix:{{ nginx_fcgiwrap_sock }}; - fastcgi_param AUTH_USER $remote_user; - fastcgi_param REMOTE_USER $remote_user; - } - location ~ \.php$ { - fastcgi_pass {{ php_upstream }}; - fastcgi_index index.php; - include fastcgi.conf; - } -{% endblock %} diff --git a/tests/includes/post_Debian.yml b/tests/includes/post_Debian.yml index b0a81dd..571ee93 100644 --- a/tests/includes/post_Debian.yml +++ b/tests/includes/post_Debian.yml @@ -8,12 +8,6 @@ with_items: - backuppc -- name: APT | Install nagios3 (only on old Debian releases) - apt: - pkg: nagios3 - state: present - when: ansible_distribution_major_version | version_compare('9', 'lt') - - name: SERVICE | Ensure backuppc is started service: name: backuppc diff --git a/tests/includes/post_FreeBSD.yml b/tests/includes/post_FreeBSD.yml index 3c48e55..28fd393 100644 --- a/tests/includes/post_FreeBSD.yml +++ b/tests/includes/post_FreeBSD.yml @@ -5,7 +5,6 @@ # pkg: "{{ item }}" # state: present # with_items: -# - nagios # - backuppc # #- name: COMMAND | Activate backuppc config @@ -19,13 +18,6 @@ # owner: backuppc # group: backuppc # -#- name: FILE | Fix fcgiwrap permission -# file: -# path: "{{ nginx_fcgiwrap_sock }}" -# mode: 0640 -# owner: "{{ nginx_user }}" -# group: "{{ nginx_user }}" - # # We don't manage BackupPC on FreeBSD... too dirty. :/ # diff --git a/tests/test.yml b/tests/test.yml index cf2d149..47d0b41 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -60,11 +60,6 @@ state: 'absent' - name: 'hanx' password: 'qwerty' - - name: 'nagios' - description: 'Please login to Nagios!' - users: - - name: 'nagiosadmin' - password: 'nagios' - name: 'deleteme' description: 'Please login!' users: [] @@ -221,9 +216,6 @@ - name: 'backuppc.local' template: '_backuppc' htpasswd: 'hello' - - name: 'nagios3.local' - template: '_nagios3' - htpasswd: 'nagios' - name: 'test-ssl.local' proto: ['http', 'https'] template: '_base' @@ -428,33 +420,6 @@ when: ansible_distribution != 'FreeBSD' failed_when: authbpc.content.find('BackupPC Server Status') == -1 -# -------------------------------- -# Nagios (not avaiblable on Debian >= 9 and not tested on FreeBSD) -# -------------------------------- - - block: - - - name: -- VERIFY NAGIOS3 PHP -- - uri: - url: "http://nagios3.local/side.php" - user: "nagiosadmin" - password: "nagios" - force_basic_auth: yes - return_content: yes - register: nagios_php - failed_when: nagios_php.content.find('Nagios Core') == -1 - - - name: -- VERIFY NAGIOS3 CGI -- - uri: - url: "http://nagios3.local/cgi-bin{% if ansible_distribution == 'Debian' %}/nagios3{% endif %}/summary.cgi" - user: "nagiosadmin" - password: "nagios" - force_basic_auth: yes - return_content: yes - register: nagios_cgi - failed_when: nagios_cgi.content.find('Nagios Event Summary') == -1 - - when: ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', 'lt') - # -------------------------------- # SSL # -------------------------------- diff --git a/vars/Debian.yml b/vars/Debian.yml index 017a6c4..b904ff2 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -3,6 +3,4 @@ nginx_pid: '/run/nginx.pid' nginx_etc_dir: '/etc/nginx' # Specific sites -nginx_nagios_root: '/usr/share/nagios3/htdocs' -nginx_nagios_stylesheets: '/etc/nagios3/stylesheets' nginx_fcgiwrap_sock: '/var/run/fcgiwrap.socket' diff --git a/vars/FreeBSD.yml b/vars/FreeBSD.yml index 705f40d..f57bd00 100644 --- a/vars/FreeBSD.yml +++ b/vars/FreeBSD.yml @@ -3,7 +3,6 @@ nginx_pid: '/var/run/nginx.pid' nginx_etc_dir: '/usr/local/etc/nginx' # Specific sites -nginx_nagios_root: '/usr/local/www/nagios' nginx_fcgiwrap_sock: '/var/run/fcgiwrap/fcgiwrap.sock' nginx_acmesh_bin: '/usr/local/sbin/acme.sh' diff --git a/vars/main.yml b/vars/main.yml index 6749a72..5678fcf 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -41,7 +41,6 @@ nginx_dirs: nginx_templates_no_dir: - '_backuppc' - - '_nagios3' - '_proxy' nginx_servers_default_headers: