Merge branch 'master' of https://gitea.lyc-lecastel.fr/gadmin/gsb2021

roles/fog/defaults/main.yml

@@ -0,0 +1,2 @@
+depl_url: "http://s-adm.gsb.adm/gsbstore/"
+depl_fog: "fogproject-1.5.9.tar.gz"

roles/fog/tasks/main.yml

@@ -6,10 +6,10 @@
 
   - name: recuperation du fichier d'installation de fog
     get_url:
-      url: http://depl/gsbstore/fogproject-1.5.7.tar.gz
+      url: "{{ depl_url }}/{{ depl_fog }}"
       dest: /root/fog
 
   - name: decompression du fichier d'installation de fog
     unarchive:
-      src: /root/fog/fogproject-1.5.7.tar.gz
+      src: "/root/fog/{{ depl_fog }}"
       dest: /root/fog

roles/icinga/files/cfg/hostgroups_icinga.cfg

@@ -15,13 +15,13 @@ define hostgroup {
 define hostgroup { 
 	hostgroup_name debian-servers 
 	alias		Serveurs distant
-	members        s-infra, s-proxy, r-int, r-ext, s-adm, s-itil
+	members        s-infra, s-proxy, r-int, r-ext, s-adm, s-itil, s-mess
 } 
 
 define hostgroup { 
 	hostgroup_name ssh-servers 
 	alias 		acces SSH 
-	members		s-adm, s-infra, s-proxy, r-int, r-ext, localhost, gwsio2, s-itil	 
+	members		s-adm, s-infra, s-proxy, r-int, r-ext, localhost, gwsio2, s-itil, s-mess, s-lb
 }
 
 define hostgroup { 
@@ -39,7 +39,7 @@ define hostgroup {
 define hostgroup {
         hostgroup_name  http-servers
 		alias           serveurs-web
-		members         localhost, s-itil 
+		members         localhost, s-itil, s-adm
         }
 
 #define hostgroup {
@@ -69,6 +69,7 @@ define hostgroup{
 define hostgroup{
 	hostgroup_name	uptimegrp
 	alias		uptimegrp
-	members		s-infra, s-proxy, r-int, r-ext, s-adm, s-itil
+	members		s-infra, s-proxy, r-int, r-ext, s-adm, s-itil, s-mess, s-lb
 }
 
+

roles/icinga/files/hostgroups_icinga.cfg

@@ -1,75 +0,0 @@
-# Some generic hostgroup definitions
-
-define hostgroup {
-        hostgroup_name  all
-		alias           All Servers
-		members         *
-        }
-
-define hostgroup {
-        hostgroup_name 	       localhost
-		alias          Debian GNU/Linux Servers
-		members        localhost  
-        }
-
-define hostgroup { 
-	hostgroup_name debian-servers 
-	alias		Serveurs distant
-	members        s-infra, s-proxy, r-int, r-ext, s-adm, s-itil, s-mess
-} 
-
-define hostgroup { 
-	hostgroup_name ssh-servers 
-	alias 		acces SSH 
-	members		s-adm, s-infra, s-proxy, r-int, r-ext, localhost, gwsio2, s-itil, s-mess, s-lb
-}
-
-define hostgroup { 
-	hostgroup_name dns-servers
-	alias serveurs-dns 
-	members s-infra, srv-2012 
-} 
-
-define hostgroup { 
-	hostgroup_name dhcp-servers
-	alias serveurs-dhcp 
-	members r-int, srv-2012 
-} 
-
-define hostgroup {
-        hostgroup_name  http-servers
-		alias           serveurs-web
-		members         localhost, s-itil, s-adm
-        }
-
-#define hostgroup {
-#        hostgroup_name  email-servers
-#		alias           serveurs-email
-#		members         s-mess
-#       }
-
-define hostgroup { 
-	hostgroup_name proxy-servers
-	alias 		serveurs-proxy 
-	members 	s-proxy 
-}
-
-define hostgroup{
-	hostgroup_name	windows-servers
-	alias		windows-servers
-	members		srv-2012
-}
-
-#define hostgroup{
-#	hostgroup_name	switch
-#	alias		switch
-#	members		netgear
-#}
-
-define hostgroup{
-	hostgroup_name	uptimegrp
-	alias		uptimegrp
-	members		s-infra, s-proxy, r-int, r-ext, s-adm, s-itil, s-mess, s-lb
-}
-
-

roles/s-lb-ab/files/haproxy.cfg

@@ -44,7 +44,7 @@ backend fermeweb
 	#option httpchk HEAD / HTTP/1.0
 	server s-lb-web1 192.168.101.1:80 check
 	server s-lb-web2 192.168.101.2:80 check
-#	server s-lb-web3 192.168.101.2:80 check
+#	server s-lb-web3 192.168.101.3:80 check
 
 listen stats
 	bind	*:8080

s-agence.yml

@@ -7,3 +7,4 @@
     - ssh-cli
     - syslog-cli
     - post
+    - goss