From a537adb16e87741223e63c28e28ec7c13e135602 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 15 Mar 2016 18:33:55 -0400 Subject: [PATCH] testnodes: Disable ssl requirement for nrpe on rpm-based distros Signed-off-by: David Galloway --- roles/testnode/tasks/nagios.yml | 20 ++++++++++++------- .../templates/nagios/nagios-nrpe-server | 1 - 2 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 roles/testnode/templates/nagios/nagios-nrpe-server diff --git a/roles/testnode/tasks/nagios.yml b/roles/testnode/tasks/nagios.yml index ac8bdb6..7be89e3 100644 --- a/roles/testnode/tasks/nagios.yml +++ b/roles/testnode/tasks/nagios.yml @@ -8,13 +8,19 @@ mode: 0440 validate: visudo -cf %s -- name: Configure nagios nrpe settings. - template: - src: nagios/nagios-nrpe-server - dest: "/etc/default/{{ nrpe_service_name }}" - owner: root - group: root - mode: 0644 +- name: Configure nagios nrpe settings (Ubuntu) + lineinfile: + dest: /etc/default/{{ nrpe_service_name }} + regexp: "^DAEMON_OPTS" + line: "DAEMON_OPTS=\"--no-ssl\"" + when: ansible_pkg_mgr == "apt" + +- name: Configure nagios nrpe settings (RHEL/CentOS) + lineinfile: + dest: /etc/sysconfig/{{ nrpe_service_name }} + regexp: "^NRPE_SSL_OPT" + line: "NRPE_SSL_OPT=\"-n\"" + when: ansible_pkg_mgr == "yum" - name: Upload nagios nrpe config. template: diff --git a/roles/testnode/templates/nagios/nagios-nrpe-server b/roles/testnode/templates/nagios/nagios-nrpe-server deleted file mode 100644 index 4d92a12..0000000 --- a/roles/testnode/templates/nagios/nagios-nrpe-server +++ /dev/null @@ -1 +0,0 @@ -DAEMON_OPTS="--no-ssl" -- 2.39.5