diff --git a/icinga2-ansible-no-ui/defaults/main.yml b/icinga2-ansible-no-ui/defaults/main.yml index 32f7a511065c486e6c9b4dd68081ccbe5a6d4321..0a3c64534f92a83811029d7f9a34985baf2f87e2 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 749dca2356bdd533dc335e20d83d5ea443151ff0..814c754027266c6855cd4495e3c9e9be868664d0 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 708f59eab7905448595f81bf516e06a440721724..67db1acacf2a1f8acd8eb0b126912845befc39e4 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 cbc704335d204ba75d6d914ad814948b9cea6e86..e9c1f32423ee18a8aeaadee55e2c8f08edf0995c 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