From 56cd0c515b8bb20f7b0a08dcca935f02299938c3 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Jan 2021 15:14:30 +0100 Subject: [PATCH 1/5] ajout de dpkg et ajout de checkresults --- roles/icinga-fk/tasks/main.yml | 37 ++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/roles/icinga-fk/tasks/main.yml b/roles/icinga-fk/tasks/main.yml index 887f024..07c9347 100644 --- a/roles/icinga-fk/tasks/main.yml +++ b/roles/icinga-fk/tasks/main.yml @@ -55,20 +55,45 @@ path: /var/lib/icinga owner: nagios mode: 751 - recurse: yes + recurse: yes notify: - - restart icinga + - restart icinga - -- name: attribution des droits dossier icinga rw +- name: attribution des droits dossier icinga rw file: path: /var/lib/icinga/rw owner: nagios mode: 2710 - recurse: yes + recurse: yes notify: - - restart icinga + - restart icinga +- name: activation des commandes externes + replace: + dest: /etc/icinga/icinga.cfg + regexp: 'check_external_commands=0' + replace: 'check_external_commands=1' + notify: + - restart icinga + +- name: reconfiguration des droits avec dpkg statoverride + shell: dpkg-statoverride --update --add nagios www-data 2710 /var/lib/icinga/rw + +- name: reconfiguration des droits avec dpkg statoverride + shell: dpkg-statoverride --update --add nagios nagios 751 /var/lib/icinga + +- name: suppression de checkresults + file: + path: /var/lib/icinga/spool/checkresults + state: absent + +- name: creation du dossier checkresults avec droits de lecture + file: + path:/var/lib/icinga/spool/checkresults + state: directory + owner: nagios + group: root + mode: '755' #- name: Changement droit notif # shell: chmod 644 /var/log/icinga/icinga.log From 0021fdca7d4677859b482ede0144865ef2685e6f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Jan 2021 15:29:24 +0100 Subject: [PATCH 2/5] modif pathresults --- roles/icinga-fk/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/icinga-fk/tasks/main.yml b/roles/icinga-fk/tasks/main.yml index 07c9347..49c5ec3 100644 --- a/roles/icinga-fk/tasks/main.yml +++ b/roles/icinga-fk/tasks/main.yml @@ -89,7 +89,7 @@ - name: creation du dossier checkresults avec droits de lecture file: - path:/var/lib/icinga/spool/checkresults + path: /var/lib/icinga/spool/checkresults state: directory owner: nagios group: root From cd4ac6c12b6bbf9d78a7827285ea028023e6ccc1 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Jan 2021 15:50:34 +0100 Subject: [PATCH 3/5] ajout python3 par defaut --- roles/icinga-fk/tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/icinga-fk/tasks/main.yml b/roles/icinga-fk/tasks/main.yml index 49c5ec3..20e14d0 100644 --- a/roles/icinga-fk/tasks/main.yml +++ b/roles/icinga-fk/tasks/main.yml @@ -32,6 +32,13 @@ backup : yes notify: - restart icinga + +- name: python3 par defaut + alternatives: + link: /usr/bin/python + name: python + path: /usr/bin/python3 + priority: 10 - name: Changement de mot de passe de icingaadmin htpasswd: From 96cb377d9bd4d8b0b844b5747624823cbe26ee41 Mon Sep 17 00:00:00 2001 From: bb Date: Tue, 12 Jan 2021 16:16:04 +0100 Subject: [PATCH 4/5] Changement des droits sur /plugins/fusioninventory --- roles/itil/defaults/main.yml | 2 +- roles/itil/tasks/main.yml | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/roles/itil/defaults/main.yml b/roles/itil/defaults/main.yml index f82b605..44c63a9 100644 --- a/roles/itil/defaults/main.yml +++ b/roles/itil/defaults/main.yml @@ -1,4 +1,4 @@ -depl_url: "http://s-adm.gsb.adm/gsbstore" +depl_url: "http://s-adm.gsb.adm/gsbstore/" depl_glpi: "glpi-9.5.3.tgz" depl_fusioninventory: "fusioninventory-9.5.0+1.0.tar.bz2" depl_fusioninventory_agentx64: "fusioninventory-agent_windows-x64_2.6.exe" diff --git a/roles/itil/tasks/main.yml b/roles/itil/tasks/main.yml index 9d19ffa..e93e925 100644 --- a/roles/itil/tasks/main.yml +++ b/roles/itil/tasks/main.yml @@ -84,6 +84,8 @@ file: path: "{{ glpi_dir }}/plugins" mode: 0777 + owner: www-data + group: www-data recurse: yes - name: Attribution des permissions @@ -98,12 +100,6 @@ #src: http://depl/gsbstore/fusioninventory-{{ fd_version }}.tar.bz2 dest: /var/www/html/glpi/plugins remote_src: yes - file: - path: /var/www/html/glpi/plugins/fusioninventory - state: directory - owner: www-data - group: www-data - mode: 0775 - name: Creation de ficlient file: @@ -130,6 +126,14 @@ url: "{{ depl_url }}/{{ depl_fusioninventory_agentx86 }}" dest: "/var/www/html/ficlients" + - name: Attribution des permissions sur repertoire /plugins/fusioninventory + file: + path: /var/www/html/glpi/plugins/fusioninventory + owner: www-data + group: www-data + recurse: yes + state: directory + - name: Copie du script dbdump copy: src=dbdump dest=/root/ From 0ef79d9bf9347ca8faa01c6932144f77fe9bb38a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Jan 2021 16:18:21 +0100 Subject: [PATCH 5/5] ajout de force-all dans dpkg --- roles/icinga-fk/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/icinga-fk/tasks/main.yml b/roles/icinga-fk/tasks/main.yml index 20e14d0..84a2a8f 100644 --- a/roles/icinga-fk/tasks/main.yml +++ b/roles/icinga-fk/tasks/main.yml @@ -84,10 +84,10 @@ - restart icinga - name: reconfiguration des droits avec dpkg statoverride - shell: dpkg-statoverride --update --add nagios www-data 2710 /var/lib/icinga/rw + shell: dpkg-statoverride --update --force-all --add nagios www-data 2710 /var/lib/icinga/rw - name: reconfiguration des droits avec dpkg statoverride - shell: dpkg-statoverride --update --add nagios nagios 751 /var/lib/icinga + shell: dpkg-statoverride --update --force-all --add nagios nagios 751 /var/lib/icinga - name: suppression de checkresults file: