nagios email hostname

r-vp1.yml

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

r-vp2.yml

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

roles/apache2only/handlers/main.yml

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

roles/apache2only/tasks/main.yml

@@ -0,0 +1,10 @@
+---
+- 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. (
-                        2023051000      ; Serial
+                        2023060100      ; Serial
                         7200	        ; Refresh
                         86400           ; Retry
                         8419200         ; Expire
@@ -26,6 +26,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.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. (
-                        2023040501      ; Serial
+                        2023060100      ; Serial
                         7200            ; Refresh
                         86400           ; Retry
                         8419200         ; Expire
@@ -26,5 +26,6 @@ $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

@@ -9,6 +9,6 @@ define host{
         host_name               s-webcom
         alias                   debian-servers, http-servers
         address                 172.16.0.12
-		parents			r-int
+		parents			r-ext
         }
 

roles/nagios/files/commands.cfg

@@ -11,7 +11,7 @@
 # '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$\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$\nServer : $HOSTNAME$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" $CONTACTEMAIL$
 	}
 
 # 'notify-service-by-email' command definition

roles/post/files/interfaces.r-vp1

@@ -15,6 +15,7 @@ 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

s-webcom.yml

@@ -7,5 +7,5 @@
     - ssh-cli
     - syslog-cli
     - snmp-agent
-    - apache2
+    - apache2only
     - post

scripts/mkvm

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-mkvmrelease="v1.2.2"
+mkvmrelease="v1.2.3"
 
 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>"
+	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 "       option -r : efface vm existante avant creation nouvelle"
 	exit 1
 }
@@ -80,6 +80,8 @@ 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.2"
+$mkvmrelease="v1.2.3"
 $ovarelease="2023b"
 $ovafogrelease="2023b"
 $ovafile="$HOME\Downloads\debian-bullseye-gsb-${ovarelease}.ova"