diff --git a/roles/dns-master/files/db.gsb.lan b/roles/dns-master/files/db.gsb.lan index ef72db3..76f00af 100644 --- 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. ( - 2023060100 ; Serial + 2023051000 ; Serial 7200 ; Refresh 86400 ; Retry 8419200 ; Expire @@ -26,7 +26,6 @@ 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.11 -s-webcom IN A 172.16.0.12 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 @@ -35,6 +34,7 @@ s-lb IN A 192.168.100.10 s-web1 IN A 192.168.101.1 s-web2 IN A 192.168.101.2 s-lb.gsb.lan IN A 192.168.100.10 +s-webcom.gsb.lan IN A 192.168.100.12 ns IN CNAME s-infra.gsb.lan. wpad IN CNAME s-infra.gsb.lan. s-peertube IN A 192.168.100.20 diff --git a/roles/dns-master/files/db.gsb.lan.rev b/roles/dns-master/files/db.gsb.lan.rev index 4e85c55..7f198d9 100644 --- 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. ( - 2023060100 ; Serial + 2023040501 ; 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 +100.12 IN PTR s-webcom.gsb.lan. 11.0 IN PTR s-elk.gsb.lan. -12.0 IN PTR s-webcom.gsb.lan. 17.0 IN PTR s-gestsup.lan -254.0 IN PTR r-int.gsb.lan. \ No newline at end of file +254.0 IN PTR r-int.gsb.lan. diff --git a/roles/nagios/files/cfg/s-webcom.cfg b/roles/nagios/files/cfg/s-webcom.cfg index f0a3288..6d8b119 100644 --- a/roles/nagios/files/cfg/s-webcom.cfg +++ b/roles/nagios/files/cfg/s-webcom.cfg @@ -8,7 +8,7 @@ define host{ use linux-server ; Name of host template to use host_name s-webcom alias debian-servers, http-servers - address 172.16.0.12 - parents r-int + address 192.168.100.12 + parents r-ext } diff --git a/roles/nagios/files/hostgroups.cfg b/roles/nagios/files/hostgroups.cfg index d8f2b3e..e43b03a 100644 --- a/roles/nagios/files/hostgroups.cfg +++ b/roles/nagios/files/hostgroups.cfg @@ -2,7 +2,7 @@ define hostgroup { hostgroup_name debian-servers ; The name of the hostgroup alias Linux Servers ; Long name of the group - members s-infra, s-proxy, s-adm, s-nxc, s-appli, s-backup, s-itil, s-fog, r-int, r-ext, s-webcom ; Comma separated list of hosts that belong to this group + members s-infra, s-proxy, s-adm, s-nxc, s-appli, s-backup, s-itil, s-fog, r-int, r-ext ; Comma separated list of hosts that belong to this group } define hostgroup { diff --git a/roles/post/files/interfaces.s-webcom b/roles/post/files/interfaces.s-webcom index 9a5812f..bcb9248 100644 --- a/roles/post/files/interfaces.s-webcom +++ b/roles/post/files/interfaces.s-webcom @@ -16,6 +16,6 @@ iface enp0s3 inet static # cote N-infra allow-hotplug enp0s8 iface enp0s8 inet static - address 172.16.0.12 + address 192.168.100.12 netmask 255.255.255.0 - post-up route add -net 172.16.64.0/24 gw 172.16.0.254 \ No newline at end of file + gateway 192.168.100.254 diff --git a/scripts/mkvm b/scripts/mkvm index ba43142..353b144 100755 --- a/scripts/mkvm +++ b/scripts/mkvm @@ -1,6 +1,6 @@ #!/bin/bash -mkvmrelease="v1.2.2" +mkvmrelease="v1.2.3" ovarelease="2023b" ovafogrelease="2023b" diff --git a/scripts/mkvm.ps1 b/scripts/mkvm.ps1 index 2a87b2d..9c4853e 100644 --- a/scripts/mkvm.ps1 +++ b/scripts/mkvm.ps1 @@ -3,7 +3,7 @@ #mkvm pour toutes les vms -$mkvmrelease="v1.2.2" +$mkvmrelease="v1.2.3" $ovarelease="2023b" $ovafogrelease="2023b" $ovafile="$HOME\Downloads\debian-bullseye-gsb-${ovarelease}.ova"