goss/s-webcom.yaml

@@ -1,24 +0,0 @@
-package:
-  apache2:
-    installed: true
-addr:
-  tcp://depl.sio.lan:80:
-    reachable: true
-    timeout: 500
-port:
-  tcp:80:
-    listening: true
-service:
-  apache2:
-dns:
-  depl.sio.lan:
-    resolveable: true
-    timeout: 500
-process:
-  apache2:
-    running: true
-interface:
-  enp0s8:
-    exists: true
-    addrs:
-    - 172.16.0.12/24

pre/pull-config

@@ -5,7 +5,7 @@ prj=gsb2023
 opt=""
 
 if [ -z ${UREP+x} ]; then 
-	UREP=https://gitea.lyc-lecastel.fr/anthony.arnoux/gsb2023.git 
+	UREP=https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git 
 fi
 
 dir=/root/tools/ansible

pull-config

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -z ${UREP+x} ]; then 
-	UREP=https://gitea.lyc-lecastel.fr/anthony.arnoux/gsb2023.git 
+	UREP=https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git 
 fi
 
 dir=/root/tools/ansible

r-vp1.yml

@@ -16,5 +16,4 @@
    - wireguard-r
    - ssh-cli
    - syslog-cli
-   - fw-ferm
    

r-vp2.yml

@@ -19,4 +19,3 @@
    - post
    - ssh-cli
    - syslog-cli
-   - fw-ferm

roles/apache2only/handlers/main.yml

@@ -1,5 +0,0 @@
----
-- name: restart apache2
-  service:
-    name: apache2
-    state: restarted

roles/apache2only/tasks/main.yml

@@ -1,10 +0,0 @@
----
-- name: apt update
-  apt:
-    update_cache: yes
-    cache_valid_time: 3600
-
-- name: Install apache2
-  apt:
-    pkg:
-    - apache2

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

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
@@ -26,6 +26,5 @@ $TTL    604800
 100.10   IN      PTR      s-lb
 100.10   IN      PTR      s-lb.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.

roles/nagios/files/cfg/s-webcom.cfg

@@ -1,14 +0,0 @@
-# A simple configuration file for monitoring the local host
-# This can serve as an example for configuring other servers;
-# Custom services specific to this host are added here, but services
-# defined in nagios2-common_services.cfg may also apply.
-# 
-
-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-ext
-        }
-

roles/nagios/files/commands.cfg

@@ -11,13 +11,13 @@
 # 'notify-host-by-email' command definition
 define command{
 	command_name	notify-host-by-email
-	command_line	/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nServer : $HOSTNAME$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" $CONTACTEMAIL$
+	command_line	/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" $CONTACTEMAIL$
 	}
 
 # 'notify-service-by-email' command definition
 define command{
 	command_name	notify-service-by-email
-	command_line	/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nServer : $HOSTNAME$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+	command_line	/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
 	}
 
 

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 {
@@ -14,7 +14,7 @@ define hostgroup {
 define hostgroup {
 	hostgroup_name		http-servers
 	alias			Serveurs web
-	members			s-itil, s-webcom
+	members			s-itil
 }
 
 define hostgroup {

roles/post/files/interfaces.r-vp1

@@ -15,7 +15,6 @@ allow-hotplug enp0s8
 iface enp0s8 inet static
 	address 192.168.1.2
 	netmask 255.255.255.0
-	post-up route add default gw 192.168.1.1
 
 # accés par pont et entre vpn
 allow-hotplug enp0s9

roles/post/files/interfaces.s-agence

@@ -11,4 +11,4 @@ iface enp0s3 inet dhcp
 
 allow-hotplug enp0s8
 iface enp0s8 inet dhcp
-	post-up route add default gw 172.16.128.254
+

roles/post/files/interfaces.s-webcom

@@ -1,21 +0,0 @@
-#This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# cote N-adm
-allow-hotplug enp0s3
-iface enp0s3 inet static
-	address 192.168.99.12
-	netmask 255.255.255.0
-    gateway 192.168.99.99
-
-
-# cote N-infra
-allow-hotplug enp0s8
-iface enp0s8 inet static
-	address 172.16.0.12
-	netmask 255.255.255.0
-	post-up route add -net 172.16.64.0/24 gw 172.16.0.254

s-webcom.yml

@@ -1,11 +0,0 @@
----
-- hosts: localhost
-  connection: local
-
-  roles:
-    - base
-    - ssh-cli
-    - syslog-cli
-    - snmp-agent
-    - apache2only
-    - post

scripts/mkvm

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-mkvmrelease="v1.2.3"
+mkvmrelease="v1.2.2"
 
 ovarelease="2023b"
 ovafogrelease="2023b"
@@ -11,7 +11,7 @@ deletemode=0
 usage () {
 	echo "$0 - version ${mkvmrelease} - Ova version ${ovarelease}"
 	echo "$0 : creation VM et parametrage interfaces"
-	echo "usage : $0 [-r] <s-adm|s-infra|r-int|r-ext|s-proxy|s-mon|s-appli|s-backup|s-itil|s-ncx|s-fog|s-webcom>"
+	echo "usage : $0 [-r] <s-adm|s-infra|r-int|r-ext|s-proxy|s-mon|s-appli|s-backup|s-itil|s-ncx|s-fog>"
 	echo "       option -r : efface vm existante avant creation nouvelle"
 	exit 1
 }
@@ -80,8 +80,6 @@ elif [[ "${vm}" == "r-ext" ]] ; then
 	./addint.r-ext
 elif [[ "${vm}" == "s-mon" ]] ; then
         create_if "${vm}" "n-adm" "n-infra"
-elif [[ "${vm}" == "s-webcom" ]] ; then
-        create_if "${vm}" "n-adm" "n-infra"
 elif [[ "${vm}" == "s-appli" ]] ; then
         create_if "${vm}" "n-adm" "n-infra"
 elif [[ "${vm}" == "s-backup" ]] ; then

scripts/mkvm.ps1

@@ -3,7 +3,7 @@
 
 #mkvm pour toutes les vms
 
-$mkvmrelease="v1.2.3"
+$mkvmrelease="v1.2.2"
 $ovarelease="2023b"
 $ovafogrelease="2023b"
 $ovafile="$HOME\Downloads\debian-bullseye-gsb-${ovarelease}.ova"
@@ -43,7 +43,7 @@ function create_if{ param([string]$nomvm, [string]$nic, [int]$rang, [string]$res
 }
 
 function usage{
-	Write-Host "usage : mkvm ${myInvocation.ScriptName} <s-adm|s-infra|r-int|r-ext|s-proxy|s-mon|s-agence|s-appli|s-backup|s-itil|s-ncx|s-fog|s-dns-ext|s-web-ext|s-lb|s-lb-bd|s-lb-web1|s-lb-web2|s-lb-web3|s-webcom>"
+	Write-Host "usage : mkvm ${myInvocation.ScriptName} <s-adm|s-infra|r-int|r-ext|s-proxy|s-mon|s-agence|s-appli|s-backup|s-itil|s-ncx|s-fog|s-dns-ext|s-web-ext|s-lb|s-lb-bd|s-lb-web1|s-lb-web2|s-lb-web3>"
 }
 
 if ($args[0] -eq "s-adm") {
@@ -80,7 +80,6 @@ elseif (((((((($args[0] -eq "s-elk") `
 -or ($args[0] -eq "s-appli") `
 -or ($args[0] -eq "s-infra") `
 -or ($args[0] -eq "s-proxy") `
--or ($args[0] -eq "s-webcom") `
 -or ($args[0] -eq "s-itil") `
 -or ($args[0] -eq "s-nxc") `
 ))))))) {