nettoyage pull-config

goss/r-vp1.yaml

@@ -1,21 +1,20 @@
 file:
   /etc/wireguard/wg0.conf:
     exists: true
-    mode: "0644"
+    mode: "0600"
     owner: root
     group: root
     filetype: file
-    contains:
-    - AllowedIPs = 10.0.0.2/32, 172.16.128.0/24
+    contains: []
 package:
   wireguard:
     installed: true
     versions:
-    - 1.0.20210223-1
+    - 1.0.20210914-1
   wireguard-tools:
     installed: true
     versions:
-    - 1.0.20210223-1
+    - 1.0.20210914-1+b1
 service:
   wg-quick@wg0:
     enabled: true

goss/r-vp2.yaml

@@ -2,6 +2,7 @@ file:
   /etc/wireguard/wg0.conf:
     exists: true
     mode: "0600"
+    size: 374
     owner: root
     group: root
     filetype: file

localhost,

@@ -1,83 +0,0 @@
-# Ce fichier viminfo a été généré par Vim 9.0.
-# Vous pouvez l'éditer, mais soyez prudent.
-
-# Viminfo version
-|1,4
-
-# 'encoding' dans lequel ce fichier a été écrit
-*encoding=utf-8
-
-
-# hlsearch on (H) or off (h):
-~h
-# Historique ligne de commande (chronologie décroissante) :
-:q!
-|2,0,1703236388,,"q!"
-:x
-|2,0,1703236381,,"x"
-:x!
-|2,0,1703236221,,"x!"
-
-# Historique chaîne de recherche (chronologie décroissante) :
-
-# Historique expression (chronologie décroissante) :
-
-# Historique ligne de saisie (chronologie décroissante) :
-
-# Historique Ligne de débogage (chronologie décroissante) :
-
-# Registres :
-""1	LINE	0
-	  connection: local
-|3,1,1,1,1,0,1703236374,"  connection: local"
-"2	LINE	0
-	  hosts: localhost
-|3,0,2,1,1,0,1703236374,"  hosts: localhost"
-
-# Marques dans le fichier :
-'0  1  2  ~/tools/ansible/gsb2024/s-mon.yml
-|4,48,1,2,1703236388,"~/tools/ansible/gsb2024/s-mon.yml"
-'1  1  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,49,1,9,1703236339,"~/tools/ansible/gsb2024/s-mon.yml"
-'2  9  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,50,9,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
-'3  9  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,51,9,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
-'4  11  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,52,11,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
-'5  11  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,53,11,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
-'6  1  13  ~/tools/ansible/gsb2024/s-mon.yml
-|4,54,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
-'7  1  13  ~/tools/ansible/gsb2024/s-mon.yml
-|4,55,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
-'8  1  13  ~/tools/ansible/gsb2024/s-mon.yml
-|4,56,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
-'9  1  13  ~/tools/ansible/gsb2024/s-mon.yml
-|4,57,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
-
-# Liste de sauts (le plus récent en premier) :
--'  1  2  ~/tools/ansible/gsb2024/s-mon.yml
-|4,39,1,2,1703236388,"~/tools/ansible/gsb2024/s-mon.yml"
--'  1  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,39,1,9,1703236339,"~/tools/ansible/gsb2024/s-mon.yml"
--'  9  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,39,9,9,1703236318,"~/tools/ansible/gsb2024/s-mon.yml"
--'  11  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,39,11,9,1703236318,"~/tools/ansible/gsb2024/s-mon.yml"
--'  11  9  ~/tools/ansible/gsb2024/s-mon.yml
-|4,39,11,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
--'  1  13  ~/tools/ansible/gsb2024/s-mon.yml
-|4,39,1,13,1703236018,"~/tools/ansible/gsb2024/s-mon.yml"
--'  1  13  ~/tools/ansible/gsb2024/s-mon.yml
-|4,39,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
-
-# Historique des marques dans les fichiers (les plus récentes en premier) :
-
-> ~/tools/ansible/gsb2024/s-mon.yml
-	*	1703236386	0
-	"	1	2
-	^	9	10
-	.	2	0
-	+	10	0
-	+	2	0

pre/pull-config

@@ -14,15 +14,15 @@ dir=/root/tools/ansible
 
 cd  "${dir}" || exit 1
 
-hostname  > hosts
 if [[ $# == 1 ]] ; then
 	opt=$1
 fi
 if [[ "${opt}" == '-l'  ]] ; then
-   cd "${dir}/${prj}" || exit 2	
-   ansible-playbook -i localhost, -c local  "$(hostname).yml"
+	cd "${dir}/${prj}" || exit 2
+	echo "Execution locale ...."
+	ansible-playbook -i localhost, -c local  "$(hostname).yml"
 else
-   ansible-pull -i "${dir}/hosts"  -C main -U "${UREP}"
+	ansible-pull -i "$(hostname)," -U "${UREP}"
 fi
 
 exit 0

pull-config

@@ -1,7 +1,11 @@
 #!/bin/bash
 
+dir=/root/tools/ansible
+prj=gsb2024
+opt=""
+
 if [ -z ${UREP+x} ]; then 
-	UREP=https://gitea.lyc-lecastel.fr/gsb/gsb2024.git 
+	UREP=https://gitea.lyc-lecastel.fr/gsb/gsb2024.git
 fi
 
 dir=/root/tools/ansible
@@ -10,7 +14,15 @@ dir=/root/tools/ansible
 
 cd  "${dir}" || exit 1
 
-hostname  > hosts
-ansible-pull -i "${dir}/hosts"  -C main -U "${UREP}"
+if [[ $# == 1 ]] ; then
+	opt=$1
+fi
+if [[ "${opt}" == '-l'  ]] ; then
+	cd "${dir}/${prj}" || exit 2
+	echo "Execution locale ...."
+	ansible-playbook -i localhost, -c local  "$(hostname).yml"
+else
+	ansible-pull -i "$(hostname)," -U "${UREP}"
+fi
 
 exit 0

roles/dhcp/files/dhcpd.conf

@@ -120,7 +120,7 @@ subnet 172.16.65.0 netmask 255.255.255.0 {
 #DHCP pour le réseau USER
 
 subnet 172.16.64.0 netmask 255.255.255.0 {
-        range 172.16.64.20 172.16.64.120;
+        range 172.16.64.100 172.16.64.150;
         option domain-name-servers 172.16.0.1 ;
         option routers 172.16.64.254;
         option broadcast-address 172.16.64.255;

roles/fog/files/.fogsettings.single-if

@@ -0,0 +1,46 @@
+## Start of FOG Settings
+## Created by the FOG Installer
+## Find more information about this file in the FOG Project wiki:
+##     https://wiki.fogproject.org/wiki/index.php?title=.fogsettings
+## Version: 1.5.10
+## Install time: mar. 16 janv. 2024 15:27:57
+ipaddress='192.168.99.100'
+copybackold='0'
+interface='enp0s3'
+submask='255.255.255.0'
+hostname='s-fog.gsb.lan'
+routeraddress='192.168.99.99'
+plainrouter='192.168.99.99'
+dnsaddress='192.168.99.99'
+username='fogproject'
+password='zbSw#FaGPS7O1bJ5tpfj'
+osid='2'
+osname='Debian'
+dodhcp='Y'
+bldhcp='0'
+dhcpd='isc-dhcp-server'
+blexports='1'
+installtype='N'
+snmysqluser='fogmaster'
+snmysqlpass='cbZjO*gCONbbldV4a6l1'
+snmysqlhost='localhost'
+mysqldbname='fog'
+installlang='0'
+storageLocation='/images'
+fogupdateloaded=1
+docroot='/var/www/html/'
+webroot='/fog/'
+caCreated='yes'
+httpproto='http'
+startrange=''
+endrange=''
+packages='apache2 bc build-essential cpp curl g++ gawk gcc genisoimage git gzip htmldoc isolinux lftp libapache2-mod-php libc6 libcurl4 liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server php php-bcmath php-cli php-curl php-fpm php-gd php-json php-ldap php-mbstring php-mysql tar tftpd-hpa tftp-hpa unzip vsftpd wget zlib1g'
+noTftpBuild=''
+tftpAdvOpts=''
+sslpath='/opt/fog/snapins/ssl/'
+backupPath='/home/'
+armsupport=''
+php_ver='7.4'
+sslprivkey='/opt/fog/snapins/ssl//.srvprivate.key'
+sendreports='Y'
+## End of FOG Settings

roles/fog/tasks/main.yml

@@ -42,8 +42,8 @@
     src: "/tmp/{{ depl_fog }}"
     dest: "/tmp/"
 
-- name: Exécution du script d'installation Fog
-  ansible.builtin.shell: sudo bash /tmp/fogproject-1.5.10/bin/installfog.sh --recreate-keys -f /tmp/fogsettings -y
-  args:
-    chdir: "/tmp/fogproject-1.5.10/"
+      #- name: Exécution du script d'installation Fog
+      #  ansible.builtin.shell: sudo bash /tmp/fogproject-1.5.10/bin/installfog.sh --recreate-keys -f /tmp/fogsettings -y
+      #  args:
+      #    chdir: "/tmp/fogproject-1.5.10/"
 

roles/kea/README.md

@@ -0,0 +1,14 @@
+# Rôle Kea
+***
+Rôle du Kea pour la haute disponibilité dhcp
+
+## Tables des matières
+    1. [Que fait le rôle Kea ?]
+
+
+## Que fait le rôle Kea ?
+Il permet de configurer les serveur kea en mode haute disponibilité.
+
+### Installation et configuration de kea
+
+Le rôle kea va installer les packets kea dhcp4, hook, admin une fois les packets installer. Nous allons configurer les 2 serveurs kea pour qu'il distribut les ip de n-user et soit en haute disponibilité.

roles/kea/default/main.yml

@@ -0,0 +1,8 @@
+#variable kea
+kea_ver: "2.4.1"
+kea_dbname: ""
+kea_dbuser: ""
+kea_dbpasswd: ""
+kea_dhcp4_dir: "/etc/kea/kea-dhcp4.conf"
+kea_ctrl_dir: "/etc/kea/kea-ctrl-agent.conf"
+

roles/kea/handlers/main.yml

@@ -0,0 +1,5 @@
+ - name: restart zabbix agent
+   service:
+     name: zabbix-agent
+     state: restarted
+     enabled: yes

roles/kea/tasks/main.yml

@@ -0,0 +1,65 @@
+    - name: installation des dépendances
+      apt:
+        name:
+        - liblog4cplus-2.0.5
+        - libmariadb3
+        - libpq5
+        - mariadb-common
+        - mysql-common
+        state: present
+
+    - name: telechargemement du paquet isc-kea-common 
+      get_url:
+        url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-common_2.4.1-isc20231123184533/isc-kea-common_2.4.1-isc20231123184533_amd64.deb" 
+        dest: "/tmp"
+    
+    - name: telechargement du paquet isc-kea-dhcp4
+      get_url:
+        url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-dhcp4_2.4.1-isc20231123184533/isc-kea-dhcp4_2.4.1-isc20231123184533_amd64.deb" 
+        dest: "/tmp"
+
+    - name: telechargement du paquet isc-kea-ctrl-agent
+      get_url:
+        url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-ctrl-agent_2.4.1-isc20231123184533/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb" 
+        dest: "/tmp"
+
+    - name: telechargement du  paquet isc-kea-hooks
+      get_url:
+        url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-hooks_2.4.1-isc20231123184533/isc-kea-hooks_2.4.1-isc20231123184533_amd64.deb" 
+        dest: "/tmp"
+    - name: Update apt
+      apt:
+        update_cache: yes
+    
+    - name: Installation paquet isc-kea-common
+      apt:
+        deb: "/tmp/isc-kea-common_2.4.1-isc20231123184533_amd64.deb"
+        state: present
+
+
+    - name: Installation isc-kea-dhcp4
+      apt:
+        deb: "/tmp/isc-kea-dhcp4_2.4.1-isc20231123184533_amd64.deb"
+        state: present
+
+    - name: Installation isc-kea-ctrl-agent
+      apt:
+        deb: "/tmp/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb"
+        state: present
+
+
+    - name: Installation isc-kea-ctrl-agent
+      apt:
+        deb: "/tmp/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb"
+        state: present
+
+    - name: Installation isc-kea-hooks
+      apt:
+        deb: "/tmp/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb"
+        state: present
+
+
+    - name: Installation isc-kea-hooks
+      apt:
+        deb: "/tmp/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb"
+        state: present

s-fog.yml

@@ -9,6 +9,6 @@
       #    - ssh-cli
 #    - snmp-agent
     # - syslog-cli
-    #    - fog
+    - fog
     #-   - journald-snd  
-    - post
+    #- post

s-mon.yml

@@ -1,8 +1,8 @@
 ---
 - name: Zabbix
-  hosts: all
-  #  become: yes
-  #  become_method: sudo
+  hosts: localhost
+  become: yes
+  become_method: sudo
   #  become_user: root
   #  vars:
   #  access: "Restricted Nagios4 Access"