From a086ea68c78b33b01a56055296733ac27a075870 Mon Sep 17 00:00:00 2001
From: Assaf Flatto <assaf@aikilinux.com>
Date: Thu, 5 Apr 2018 16:47:08 +0300
Subject: [PATCH] Add nrpe plugin default installation Timezone detection for
 RedHat based distribution nrpe selinux policy

---
 icinga2-ansible-no-ui/defaults/main.yml                |  2 ++
 icinga2-ansible-web2-ui/defaults/main.yml              |  3 ++-
 .../tasks/icinga2_web2_ui_RedHat_install.yml           | 10 ++++++++++
 icinga2-nrpe-agent/defaults/main.yml                   |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/icinga2-ansible-no-ui/defaults/main.yml b/icinga2-ansible-no-ui/defaults/main.yml
index 32f7a51..0a3c645 100644
--- a/icinga2-ansible-no-ui/defaults/main.yml
+++ b/icinga2-ansible-no-ui/defaults/main.yml
@@ -13,6 +13,7 @@ icinga2_pkg:
  - icinga2
  - nagios-plugins
  - bsd-mailx
+ - nagios-nrpe-plugin
 
 icinga2_use_public_yum_repo: True
 icinga2_url_yum: "https://packages.icinga.org/epel/ICINGA-release.repo"
@@ -24,6 +25,7 @@ icinga2_yum:
  - icinga2-selinux
  - nagios-plugins-all
  - mailx
+ - nagios-plugins-nrpe
 
 icinga2_main_conf: "/etc/icinga2/icinga2.conf"
 icinga2_conf_d: "/etc/icinga2/conf.d"
diff --git a/icinga2-ansible-web2-ui/defaults/main.yml b/icinga2-ansible-web2-ui/defaults/main.yml
index 749dca2..814c754 100644
--- a/icinga2-ansible-web2-ui/defaults/main.yml
+++ b/icinga2-ansible-web2-ui/defaults/main.yml
@@ -21,7 +21,8 @@ icinga2_web2_ui_rpm:
  - icingaweb2
  - icingacli
  - git
-
+ - php-yaml
+ 
 icinga2_web2_ui_deb:
  - icingaweb2
  - git
diff --git a/icinga2-ansible-web2-ui/tasks/icinga2_web2_ui_RedHat_install.yml b/icinga2-ansible-web2-ui/tasks/icinga2_web2_ui_RedHat_install.yml
index 708f59e..67db1ac 100644
--- a/icinga2-ansible-web2-ui/tasks/icinga2_web2_ui_RedHat_install.yml
+++ b/icinga2-ansible-web2-ui/tasks/icinga2_web2_ui_RedHat_install.yml
@@ -91,6 +91,16 @@
     - icinga2_ido_postgres_configuration is defined
     - ansible_distribution_major_version == "6"
 
+- name: Find out timezone
+  slurp:
+     src: /etc/localtime
+  register: etc_localtime
+
+- name: Timezone in php.ini
+  lineinfile:
+    path: /etc/opt/rh/rh-php71/php.ini
+    regexp: '^;?date.timezone ='
+    line: 'date.timezone = "{{ etc_localtime["content"] | b64decode | regex_replace("\n") }}"'
 
 - name: Install Icinga Web2 on RedHat OS family
   yum:
diff --git a/icinga2-nrpe-agent/defaults/main.yml b/icinga2-nrpe-agent/defaults/main.yml
index cbc7043..e9c1f32 100644
--- a/icinga2-nrpe-agent/defaults/main.yml
+++ b/icinga2-nrpe-agent/defaults/main.yml
@@ -4,6 +4,7 @@
 nrpe_agent_RedHat:
  - nrpe
  - nagios-plugins-all
+ - nrpe-selinux
 
 nrpe_agent_Debian:
  - nagios-nrpe-server
-- 
GitLab