Merge branch 'main' of https://gitea.lyc-lecastel.fr/gadmin/gsb2023

update test goss
correction haproxy
2023-01-25 11:29:48 +01:00 · 2023-01-25 11:29:45 +01:00 · 2023-01-25 11:26:54 +01:00 · 2023-01-25 11:21:09 +01:00 · 2023-01-25 11:07:20 +01:00 · 2023-01-25 11:02:49 +01:00
15 changed files with 75 additions and 73 deletions
--- a/goss/r-vp1.yaml
+++ b/goss/r-vp1.yaml
@ -1,67 +1,56 @@
+file:
+  /etc/wireguard/wg0.conf:
+    exists: true
+    mode: "0644"
+    owner: root
+    group: root
+    filetype: file
+    contains:
+    - AllowedIPs = 10.0.0.2/32, 172.16.128.0/24
 package:
-#  ferm:
-#    installed: true
-  strongswan:
+  wireguard:
    installed: true
-port:
-  udp:68:
-    listening: true
+    versions:
+    - 1.0.20210223-1
+  wireguard-tools:
+    installed: true
+    versions:
+    - 1.0.20210223-1
 service:
-#  dnsmasq:
-#    enabled: true
-#    running: true
-  strongswan:
-    enabled: true
-    running: true
-  ssh:
+  wg-quick@wg0:
    enabled: true
    running: true
 command:
-  sysctl net.ipv4.ip_forward:
+  host 192.168.99.99:
    exit-status: 0
    stdout:
-    - net.ipv4.ip_forward = 1
+    - 99.99.168.192.in-addr.arpa domain name pointer s-adm.gsb.adm.
    stderr: []
    timeout: 10000
-command:  
-  ping -c 4 192.168.0.52:
+  ping -c4  10.0.0.2:
    exit-status: 0
    stdout:
-    - 4 received = 1
+    - 0% packet loss
    stderr: []
    timeout: 10000
-command:
-  ping -c 4 192.168.1.1:
-    exit-status: 0
-    stdout:
-    - 4 received = 1
-    stderr: []
-    timeout: 10000
-command:
-  ping -c 4 192.168.200.254:
-    exit-status: 0
-    stdout:
-    - 4 received = 1
-    stderr: []
-    timeout: 10000
-command:
-  ping -c 4 172.16.0.1:
-    exit-status: 0
-    stdout:
-    - 4 received = 1
-    stderr: []
-    timeout: 10000
-#process:
-#  dnsmasq:
-#    running: true
-#  squid:
-#    running: true
 interface:
+  enp0s3:
+    exists: true
+    addrs:
+    - 192.168.99.112/24
+    mtu: 1500
  enp0s8:
    exists: true
    addrs:
-    - 192.168.0.51/24
+    - 192.168.1.2/24
+    mtu: 1500
  enp0s9:
    exists: true
    addrs:
-    - 192.168.1.2/24
+    - 192.168.0.51/24
+    mtu: 1500
+  wg0:
+    exists: true
+    addrs:
+    - 10.0.0.1/32
+    mtu: 1420
--- a/goss/s-mon.yaml
+++ b/goss/s-mon.yaml
@ -49,7 +49,7 @@ interface:
  enp0s3:
    exists: true
    addrs:
-    - 192.168.99.104/24
+    - 192.168.99.8/24
  enp0s8:
    exists: true
    addrs:
--- a/roles/base/templates/hosts.j2
+++ b/roles/base/templates/hosts.j2
@ -14,14 +14,19 @@
 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.11	s-web-ext.gsb.adm
+192.168.99.10	s-lb.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

--- a/roles/base/templates/hosts.s-proxy.j2
+++ b/roles/base/templates/hosts.s-proxy.j2
@ -15,12 +15,16 @@
 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.11	s-web-ext.gsb.adm
+192.168.99.10	s-lb.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

--- a/roles/dns-master/files/db.gsb.lan
+++ b/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
--- a/roles/dns-master/files/db.gsb.lan.rev
+++ b/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
@ -25,7 +25,7 @@ $TTL    604800
 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.

--- a/roles/lb-front/files/haproxy.cfg
+++ b/roles/lb-front/files/haproxy.cfg
@ -44,7 +44,6 @@ 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.3:80 check


 listen stats
--- a/roles/lb-front/tasks/main.yml
+++ b/roles/lb-front/tasks/main.yml
@ -15,8 +15,8 @@
        balance roundrobin
        option httpclose
        #option httpchk HEAD / HTTP/1.0
-        server web1.test 192.168.56.3:80 check
-        #server web2.test 192.168.56.4:80 check
+        server s-lb-web1 192.168.101.1:80 check
+        server s-lb-web2 192.168.101.2:80 check

 - name: redemarre haproxy
  service:
--- a/roles/post/files/interfaces.s-elk
+++ b/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
--- a/roles/wireguard-l/README.md
+++ b/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"
+
--- a/s-lb-web1.yml
+++ b/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

--- a/s-lb-web2.yml
+++ b/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

--- a/s-lb.yml
+++ b/s-lb.yml
@ -5,7 +5,7 @@
   roles:
     - base
     - goss
-     - s-lb-ab
+     - lb-front
     - snmp-agent
     - post

--- a/s-nas.yml
+++ b/s-nas.yml
@ -10,8 +10,8 @@
  roles:
    - base
    - snmp-agent
-    - s-lb-wordpress
-    - s-nas-server
+    - lb-web
+    - lb-nfs-server
    - ssh-cli
    - syslog-cli
    - post
--- a/scripts/mkvm
+++ b/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"
Author	SHA1	Message	Date
root	d0ba31e795	Merge branch 'main' of https://gitea.lyc-lecastel.fr/gadmin/gsb2023	2023-01-25 11:29:48 +01:00
root	69aa1ac739	update test goss	2023-01-25 11:29:45 +01:00
Elam Monnot	90222678ce	correction haproxy	2023-01-25 11:26:54 +01:00
root	1fc84c8f19	goss s-mon correction	2023-01-25 11:21:09 +01:00
root	b17d0fbac1	correction ip s-elk en 99.11 dns-master et compagnie	2023-01-25 11:07:20 +01:00
Elam Monnot	edbce48966	correc2	2023-01-25 11:02:49 +01:00
Elam Monnot	56f3780480	Merge branch 'main' of https://gitea.lyc-lecastel.fr/gadmin/gsb2023	2023-01-25 10:45:47 +01:00
Elam Monnot	5eae26a67c	correction roles lb	2023-01-25 10:45:36 +01:00
Mathis Laceppe	7711d023e8	Merge branch 'main' of https://gitea.lyc-lecastel.fr/gadmin/gsb2023	2023-01-25 10:43:19 +01:00
Mathis Laceppe	1777bec595	mise a jour	2023-01-25 10:43:14 +01:00
Johan Largy	12621bb60a	ajout readme	2023-01-25 10:28:22 +01:00