modif backup.sh

roles/icinga/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:
@@ -55,20 +62,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 --force-all --add nagios www-data 2710 /var/lib/icinga/rw
+
+- name: reconfiguration des droits avec dpkg statoverride
+  shell: dpkg-statoverride --update --force-all --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

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"

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
@@ -124,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/
 

roles/postfix/tasks/main.yml

@@ -24,7 +24,7 @@
   shell: chmod 400 /etc/postfix/sasl_passwd
 
 - name: postmap
-  shell: postmap /etc/postfix/sasl_passwd
+  shell: /usr/sbin/postmap /etc/postfix/sasl_passwd
 
 - name: Copie thawte_Premium_Server_CA.pem
   copy: src=thawte_Premium_Server_CA.pem dest=/etc/ssl/certs/
@@ -34,3 +34,8 @@
   notify:
     - restart postfix
 
+- name: Changement des droits icinga.log
+  file:
+    path: /var/log/icinga/icinga.log
+    state: touch
+    mode: u=rw,g=w

roles/s-backup/files/backup.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+BDIR=/home/backup
+SWIN=/tmp/s-win
+
+[ -d "${BDIR}" ] || mkdir "${BDIR}"
+[ -d "${BDIR}" ] || mkdir "${BDIR}/s-win"
+[ -d "${SWIN}" ] || mkdir "${SWIN}"
+
+mount -t cifs -o ro,vers3.0,username=u-backup,password=Azerty1+ //s-win/commun "${SWIN}"
+if [ $? != 0 ] ; then
+	echo "$0 : erreur montage ${SWIN}"
+	exit 1
+fi
+rsync -av "${SWIN}/" "${BDIR}/s-win/commun"
+umount "${SWIN}"
+
+
+mount -t cifs -o ro,vers3.0,username=u-backup,password=Azerty1+ //s-win/public "${SWIN}"
+if [ $? != 0 ] ; then
+	echo "$0 : erreur montage"
+	exit 2
+fi
+rsync -av "${SWIN}/" "${BDIR}/s-win/public"
+umount "${SWIN}"
+
+exit 0
+

roles/s-backup/tasks/main.yml

@@ -4,5 +4,6 @@
     name:
     - rsync
     - smbclient
+    - cifs-utils
     state: present
 

s-mon.yml

@@ -5,8 +5,8 @@
   roles:
     - base
     - goss
-    - icinga-fk
-#   - postfix-fk
+    - icinga
+    - postfix
     - ssh-cli
     - syslog
     - post