correction ip s-elk en 99.11 dns-master et compagnie

goss/r-vp1.yaml

@@ -1,7 +1,9 @@
 package:
 #  ferm:
 #    installed: true
-  strongswan:
+   wireguard:
+    installed: true
+   wireguard-tools:
     installed: true
 port:
   udp:68:
@@ -10,7 +12,7 @@ service:
 #  dnsmasq:
 #    enabled: true
 #    running: true
-  strongswan:
+   wireguard:
     enabled: true
     running: true
   ssh:
@@ -51,6 +53,13 @@ command:
     - 4 received = 1
     stderr: []
     timeout: 10000
+command:
+  ping -c 4 10.0.0.2:
+    exit-status: 0
+    stdout:
+    - 4 received = 1
+    stderr: []
+    timeout: 10000
 #process:
 #  dnsmasq:
 #    running: true
@@ -64,4 +73,4 @@ interface:
   enp0s9:
     exists: true
     addrs:
-    - 192.168.1.2/24
+    - 192.168.1.2/24

roles/base/templates/hosts.j2

@@ -10,18 +10,23 @@
 192.168.99.3	s-appli.gsb.adm
 192.168.99.4	s-backup.gsb.adm
 192.168.99.5	s-puppet.gsb.adm
-192.168.99.6 	s-win.gsb.adm 
+192.168.99.6	s-win.gsb.adm 
 192.168.99.7	s-nxc.gsb.adm
 192.168.99.8	s-mon.gsb.adm
 192.168.99.9	s-itil.gsb.adm
-192.168.99.10	s-sspec.gsb.adm
+192.168.99.10	s-lb.gsb.adm
-192.168.99.11	s-web-ext.gsb.adm
+192.168.99.11	s-elk.gsb.adm
 192.168.99.10	s-dns.gsb.adm
 192.168.99.12	r-int.gsb.adm
 192.168.99.13	r-ext.gsb.adm
 192.168.99.14	s-nas.gsb.adm
 192.168.99.15	s-san.gsb.adm
 192.168.99.16	s-fog.gsb.adm
+192.168.99.50	s-lb-bd.gsb.adm
+192.168.99.101	s-lb-web1.gsb.adm
+192.168.99.102	s-lb-web2.gsb.adm
+192.168.99.103	s-lb-web3.gsb.adm
+
 
 192.168.99.8	syslog.gsb.adm
 

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

@@ -11,16 +11,20 @@
 192.168.99.3	s-appli.gsb.adm
 192.168.99.4	s-backup.gsb.adm
 192.168.99.5	s-puppet.gsb.adm
-192.168.99.6 	s-win.gsb.adm 
+192.168.99.6	s-win.gsb.adm 
 192.168.99.7	s-nxc.gsb.adm
 192.168.99.8	s-mon.gsb.adm
 192.168.99.9	s-itil.gsb.adm
-192.168.99.10	s-sspec.gsb.adm
+192.168.99.10	s-lb.gsb.adm
-192.168.99.11	s-web-ext.gsb.adm
+192.168.99.11	s-elk.gsb.adm
 192.168.99.10	s-dns.gsb.adm
 192.168.99.12	r-int.gsb.adm
 192.168.99.13	r-ext.gsb.adm
 192.168.99.14	s-nas.gsb.adm
+192.168.99.50	s-lb-bd.gsb.adm
+192.168.99.101	s-lb-web1.gsb.adm
+192.168.99.102	s-lb-web2.gsb.adm
+192.168.99.103	s-lb-web3.gsb.adm
 
 192.168.99.8	syslog.gsb.adm
 

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

@@ -5,7 +5,7 @@
 ;
 $TTL    604800
 @       IN      SOA     s-infra.gsb.lan. root.s-infra.gsb.lan. (
-                        2022041200      ; Serial
+                        2023012500      ; Serial
                         7200	        ; Refresh
                         86400           ; Retry
                         8419200         ; Expire
@@ -25,7 +25,7 @@ s-nxc		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
-s-elk		IN	A	172.16.0.10
+s-elk		IN	A	172.16.0.11
 s-gestsup	IN	A	172.16.0.17
 r-int    	IN      A       172.16.0.254
 r-int-lnk    	IN      A       192.168.200.254

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

@@ -5,7 +5,7 @@
 ;
 $TTL    604800
 @       IN      SOA     s-infra.gsb.lan. root.s-infra.gsb.lan. (
-                        2022041200      ; Serial
+                        2023012500      ; Serial
                         7200            ; Refresh
                         86400           ; Retry
                         8419200         ; Expire
@@ -20,12 +20,12 @@ $TTL    604800
 6.0       IN      PTR     s-win.gsb.lan.
 7.0       IN      PTR     s-nxc.gsb.lan.
 8.0       IN      PTR     s-mon.gsb.lan.
-9.0	  IN	  PTR 	  s-itil.gsb.lan.
+9.0	  IN	  PTR	  s-itil.gsb.lan.
 101.1     IN      PTR     s-web1
 101.2     IN      PTR     s-web2
 100.10   IN      PTR      s-lb
 100.10   IN      PTR      s-lb.gsb.lan
-10.0	  IN	  PTR	  s-elk.gsb.lan.
+11.0	  IN	  PTR	  s-elk.gsb.lan.
 17.0	  IN	  PTR	  s-gestsup.lan
 254.0     IN      PTR     r-int.gsb.lan.
 

roles/post/files/interfaces.s-elk

@@ -8,13 +8,13 @@ iface lo inet loopback
 # cote N-adm
 allow-hotplug enp0s3
 iface enp0s3 inet static
-	address 192.168.99.10
+	address 192.168.99.11
 	netmask 255.255.255.0
 	gateway 192.168.99.99
 
 # cote N-infra
 allow-hotplug enp0s8
 iface enp0s8 inet static
-	address 172.16.0.10
+	address 172.16.0.11
 	netmask 255.255.255.0
 	post-up route add -net 172.16.64.0/24 gw 172.16.0.254

roles/wireguard-l/README.md

@@ -0,0 +1,5 @@
+#ajout du sleep 5
+
+éditer "/etc/init.d/isc-dhcp-server"
+aller au "case \"$1\" in" et rajouter "sleep 5" avant le "if"
+

s-lb-web1.yml

@@ -4,8 +4,8 @@
 
   roles:
     - base
-    - s-lb-web-ab
+    - lb-web
     - snmp-agent
-    - s-nas-client
+    - lb-nfs-client
     - post
 

s-lb-web2.yml

@@ -4,8 +4,8 @@
 
   roles:
     - base
-    - s-lb-web-ab
+    - lb-web
     - snmp-agent
-    - s-nas-client
+    - lb-nfs-client
     - post
 

s-nas.yml

@@ -10,8 +10,8 @@
   roles:
     - base
     - snmp-agent
-    - s-lb-wordpress
+    - lb-web
-    - s-nas-server
+    - lb-nfs-server
     - ssh-cli
     - syslog-cli
     - post

scripts/mkvm

@@ -97,11 +97,11 @@ elif [[ "${vm}" == "s-nxc" ]] ; then
         create_if "${vm}" "n-adm" "n-infra"
 elif [[ "${vm}" == "s-lb" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz" "n-dmz-lb"
-elif [[ "${vm}" == "s-web1" ]] ; then
+elif [[ "${vm}" == "s-lb-web1" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz-lb" "n-dmz-db"
-elif [[ "${vm}" == "s-web2" ]] ; then
+elif [[ "${vm}" == "s-lb-web2" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz-lb" "n-dmz-db"
-elif [[ "${vm}" == "s-web3" ]] ; then
+elif [[ "${vm}" == "s-lb-web3" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz-lb" "n-dmz-db"
 elif [[ "${vm}" == "s-lb-bd" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz-db"