README.md

@@ -34,10 +34,10 @@ On utilisera l'image de machine virtuelle suivante :
     cd gsb2021/pre
     bash inst-depl
     cd /var/www/html/gsbstore
-    bash getall
+    bash getall-latest
-    cd /root/tools/ansible/gsb021/pre
+    cd /root/tools/ansible/gsb021
     bash gsbboot
-    cd .. ; bash pull-config/pre
+    bash pull-config
 ```
   - redémarrer
   
@@ -49,11 +49,12 @@ On utilisera l'image de machine virtuelle suivante :
   - redémarrer
   - mettre à jour les paquets : apt update && apt upgrade
   - cloner le dépot : 
-```shell
+``̀ shell
 mkdir -p tools/ansible ; cd tools/ansible
 git clone https://gitea.lyc-lecastel.fr/gadmin/gsb2021.git
 cd gsb2021/pre
-export DEPL=192.168.99.99
 bash gsbboot
-bash pull-config
+bashh pull-config
-```
+`̀̀``
+
+   curl depl/gsbboot|bash

goss/s-agence.yaml

@@ -25,7 +25,7 @@ command:
     - 0% packet loss
     stderr: []
     timeout: 10000
-  ping -c 2 192.168.200.254:
+  ping -c 2 192.168.200.254
     exit-status: 0
     stdout:
     - 0% packet loss

pre/inst-depl

@@ -11,29 +11,28 @@ STOREREP="/var/www/html/gsbstore"
 [[ -d "${STOREREP}" ]]|| mkdir "${STOREREP}"
  
 (cat <<EOT > "${STOREREP}/getall"
+
 #!/bin/bash
 
-LPIREL=9.5.3
+set -o errexit
-wget -nc https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz
+set -o pipefail
 
-FIREL=9.5+1.0
+GLPIREL=9.4.5
-#wget -nc https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FIREL}/fusioninventory-${FIREL}.tar.gz
+wget -nc https://github.com/glpi-project/glpi/releases/download/\${GLPIREL}/glpi-\${GLPIREL}.tgz
-#https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi9.5.0%2B1.0/fusioninventory-9.5.0+1.0.tar.bz2
-wget -nc https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi9.5.0%2B1.0/fusioninventory-9.5.0+1.0.tar.bz2
  
-FIAGREL=2.6 
+FIREL=9.4+2.4
-wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/${FIAGREL}/fusioninventory-agent_windows-x64_${FIAGREL}.exe
+wget -nc -O fusioninventory-glpi\${FIREL}.tag.gz https://github.com/fusioninventory/fusioninventory-for-glpi/archive/glpi\${FIREL}.tar.gz 
-wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/${FIAGREL}/fusioninventory-agent_windows-x86_${FIAGREL}.exe
+#https://github.com/fusioninventory/fusioninventory-for-glpi/archive/glpi9.4+2.4.tar.g 
  
-FOGREL=1.5.9
+FIAGREL=2.5.2 
-wget -nc https://github.com/FOGProject/fogproject/archive/${FOGREL}.tar.gz -O fogproject-${FOGREL}.tar.gz
+wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/\${FIAGREL}/fusioninventory-agent_windows-x64_\${FIAGREL}.exe
  
-WPREL=5.6
+wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/\$FIAGREL/fusioninventory-agent_windows-x86_\${FIAGREL}.exe
-wget -nc https://fr.wordpress.org/wordpress-5.6-fr_FR.tar.gz
  
-GOSSVER=v0.3.16
+FOGREL=1.5.7
-curl -L https://github.com/aelsabbahy/goss/releases/download/${GOSSVER}/goss-linux-amd64 -o goss
+wget -nc https://github.com/FOGProject/fogproject/archive/\${FOGREL}.tar.gz -O fogproject-\${FOGREL}.tar.gz
-chmod +x goss 
+ 
+wget -nc https://fr.wordpress.org/wordpress-5.3.2-fr_FR.tar.gz
 
 EOT
 )

roles/base/tasks/main.yml

@@ -7,14 +7,6 @@
   copy: src=apt.conf dest=/etc/apt/apt.conf
   when: ansible_hostname != "s-adm"    
 
-#- name: Sysctl desactive ipv6
-#  sysctl:
-#    name: net.ipv6.conf.all.disable_ipv6
-#    value: 1
-#    sysctl_set: yes
-#    state: present
-#    reload: yes
-
 - name: Update + Upgrade
   apt:
     upgrade: yes

roles/base/templates/hosts.j2

@@ -2,9 +2,9 @@
 127.0.1.1       {{ ansible_nodename }} {{ ansible_hostname }}
 127.0.0.1       localhost ip6-localhost ip6-loopback
 
-#10.121.38.10	depl.sio.lan depl
+10.121.38.10	depl.sio.lan depl
 
-192.168.99.99	s-adm.gsb.adm depl.sio.lan depl
+192.168.99.99	s-adm.gsb.adm
 192.168.99.1	s-infra.gsb.adm
 192.168.99.2	s-proxy.gsb.adm
 192.168.99.3	s-appli.gsb.adm

roles/base/templates/hosts.s-proxy.j2

@@ -3,9 +3,9 @@
 127.0.0.1       localhost ip6-localhost ip6-loopback
 172.16.0.2	s-proxy.gsb.lan s-proxy
 
-#10.121.38.10	depl
+10.121.38.10	depl
 
-192.168.99.99	s-adm.gsb.adm depl
+192.168.99.99	s-adm.gsb.adm
 192.168.99.1	s-infra.gsb.adm
 192.168.99.2	s-proxy.gsb.adm
 192.168.99.3	s-appli.gsb.adm

roles/dns-master/files/db.gsb.lan

@@ -21,7 +21,7 @@ s-proxy         IN      A       172.16.0.2
 s-appli    	IN      A       172.16.0.3
 s-win    	IN      A       172.16.0.6
 s-mess   	IN      A       172.16.0.7
-s-nxc		IN	A	172.16.0.7
+s-nxec		IN	A	172.16.0.7
 s-docker	IN	A	172.16.0.7
 s-mon    	IN      A       172.16.0.8
 s-itil		IN	A	172.16.0.9

roles/icinga/files/cfg/hostgroups_icinga.cfg

@@ -60,11 +60,11 @@ define hostgroup{
 	members		srv-2012
 }
 
-define hostgroup{
+#define hostgroup{
-	hostgroup_name	dns-win
+#	hostgroup_name	switch
-	alias		dns-win
+#	alias		switch
-	members		srv-2012
+#	members		netgear
-}
+#}
 
 define hostgroup{
 	hostgroup_name	uptimegrp

roles/icinga/files/cfg/services_icinga.cfg

@@ -79,7 +79,7 @@ define service{
 
 define service{
 	use				generic-service
-	hostgroup_name			dns-win
+	hostgroup_name			windows-servers
 	service_description		Service DNS
 	check_command			check_nt!SERVICESTATE!-l W32Time,"Client DNS"
 }

roles/s-lb-web-ab/tasks/main.yml

@@ -1,16 +1,10 @@
 ---
-- name: Install apache2 php php5-mysql et autres modules php
+- name: Install apache2 php php5-mysql
   apt:
     name:
     - apache2
     - php
     - php-mysql
-    - php-gd
-    - php-zip
-    - php-mbstring
-    - php-curl
-    - php-imagick
-    - php-xml
     state: present
 
 - name: copie exports pour partage nfs wordpress

roles/ssh-root-access/tasks/main.yml

@@ -1,4 +1,4 @@
-- name: Activation acces ssh root pour r-vp1 (certificat)
+- name: Activation acces ssh root pour vp-1 (certificat)
   lineinfile:
     dest: /etc/ssh/sshd_config
     regexp: "^PermitRootLogin"