modif script copy distant

pre/inst-depl

@@ -1,12 +1,13 @@
 #!/bin/bash
-## aa : 2023-04-18 15:25
+## aa : 2023-01-18 15:25
+## ps : 2023-02-01 15:25
 
 set -o errexit
 set -o pipefail
 GITUSR=gitgsb
 GITPRJ=gsb2023
-apt update && apt upgrade
+apt-get update 
-apt install -y apache2 git 
+apt-get install -y apache2 git 
 STOREREP="/var/www/html/gsbstore" 
 
 GLPIREL=10.0.6

roles/base/templates/hosts.j2

@@ -27,6 +27,8 @@
 192.168.99.102	s-lb-web2.gsb.adm
 192.168.99.103	s-lb-web3.gsb.adm
 192.168.99.112  r-vp1.gsb.adm
+192.168.99.102  r-vp2.gsb.adm
+
 
 192.168.99.8	syslog.gsb.adm
 

roles/base/templates/hosts.s-proxy.j2

@@ -26,6 +26,7 @@
 192.168.99.102	s-lb-web2.gsb.adm
 192.168.99.103	s-lb-web3.gsb.adm
 192.168.99.112  r-vp1.gsb.adm
+192.168.99.102  r-vp2.gsb.adm
 
 192.168.99.8	syslog.gsb.adm
 

roles/lb-nfs-client/tasks/main.yml

@@ -10,4 +10,4 @@
     dest: /etc/fstab
     regexp: ''
     insertafter: EOF
-    line: '192.168.102.253:/home/wordpress /var/www/html/wordpress nfs soft,timeo=5,intr,rsize=8192,wsize=8192,wsize=8192 0 0'
+    line: '192.168.102.253:/home/ /var/www/html/wordpress nfs soft,timeo=5,intr,rsize=8192,wsize=8192,wsize=8192 0 0'

roles/lb-nfs-server/tasks/main.yml

@@ -60,7 +60,7 @@
   replace:
     path: /home/wordpress/wp-config.php
     regexp: "localhost"
-    replace: "192.168.102.253"
+    replace: "192.168.102.254"
     backup: yes
 
 - name: 55 - relance nfs

roles/lb-web/tasks/main.yml

@@ -18,7 +18,7 @@
   blockinfile:
     path: /etc/fstab
     block: |
-      192.168.102.253:/exports/wordpress /var/www/html nfs soft,timeo=5,intr,rsize=8192,wsize=8192,wsize=8192 0 0
+      192.168.102.253:/home/wordpress /var/www/html nfs soft,timeo=5,intr,rsize=8192,wsize=8192,wsize=8192 0 0
 
       #- name: monte export wordpress
       #  ansible.posix.mount:

roles/ssh-cli/tasks/main.yml

@@ -1,10 +1,14 @@
 ---
 
 - name: Creation de .ssh 
-  file: path=/root/.ssh mode=0700 state=directory
+  file: 
+    path: /root/.ssh
+    mode: 0700
+    state: directory
 
-- name: Copie cle public s-adm 
+- name: Copie cle publiique depuis s-adm 
-  shell: curl 192.168.99.99/id_rsa.pub > ~/.ssh/authorized_keys 
+  ansible.posix.authorized_key:
+    user: root
+    state: present
+    key: http://s-adm.gsb.adm/id_rsa.pub
 
-#- name: Copie cle public s-spec
-#  shell: curl 192.168.99.10/id_rsa.pub >> ~/.ssh/authorized_keys 

roles/wireguard-l/tasks/main.yml

@@ -15,8 +15,6 @@
     state: present
 
 
-- name: copie du fichier de configuration depuis r-vp1
-  command: "wget http://r-vp1.gsb.adm:8000/wg0-b.conf"
 
 #- name: renommage du fichier de configuration
 #  command: "mv /etc/wireguard/wg0-b.conf /etc/wireguard/wg0.conf"

roles/wireguard-r/tasks/main.yml

@@ -40,5 +40,3 @@
     enabled: yes
     state: restarted
 
-- name: ouverture port 8000 pour copie fichier config
-  command: "cd /root/confwg/ && python3 -m http.server 8000 &"

scripts/mkvm

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-mkvmrelease="v1.2"
+mkvmrelease="v1.2.1"
 
 ovarelease="2023a"
 ovafogrelease="2023a"
@@ -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-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>"
 	echo "       option -r : efface vm existante avant creation nouvelle"
 	exit 1
 }
@@ -33,7 +33,6 @@ create_vm () {
 }
 
 setif () {
-
 	VBoxManage modifyvm  "$1" --nic"${2}" intnet
 	VBoxManage modifyvm  "$1" --intnet"${2}" "$3"
 	VBoxManage modifyvm  "$1" --nictype"${2}" 82540EM
@@ -66,7 +65,9 @@ fi
 vm="$1"
 
 create_vm "${vm}"
-if [[ "${vm}" == "s-infra" ]] ; then
+if [[ "${vm}" == "s-adm" ]] ; then
+	bash addint.s-adm
+elif [[ "${vm}" == "s-infra" ]] ; then
 	create_if "${vm}" "n-adm" "n-infra"
 elif [[ "${vm}" == "s-proxy" ]] ; then
 	create_if "${vm}" "n-adm" "n-infra"

scripts/mkvm.ps1

@@ -1,3 +1,6 @@
+# POUR POUVOIR EXECUTER DES SCRIPTS POWERSHELL SOUS WINDOWS LANCER COMMANDE SUIVANTE EN ADMIN SOUS POWERSHELL
+# set-executionpolicy unrestricted
+
 #mkvm pour toutes les vms
 
 $mkvmrelease="v1.2"
@@ -5,124 +8,151 @@ $ovarelease="2023a"
 $ovafogrelease="2023a"
 $ovafile="$HOME\Downloads\debian-bullseye-gsb-${ovarelease}.ova"
 $ovafilefog="$HOME\Downloads\debian-buster-gsb-${ovafogrelease}.ova"
+$vboxmanage="C:\Program Files\Oracle\VirtualBox\VBoxManage.exe"
 $deletemode=0
 
+#FONCTIONS
+
+function create_vm{ param([string]$nomvm)
+	#Importation depuis l'ova
+	& "$vboxmanage" import "$ovafile"  --vsys 0 --vmname "$nomvm"
+	Write-Host "Machine $nomvm importée"
+}
+
+function create_if{ param([string]$nomvm, [string]$nic, [int]$rang, [string]$reseau)
+	#Création d'une interface
+	if ($nomvm -and $nic -and $rang -and $reseau) {
+	#if ("1" -eq "1") {
+		if ($nic -eq "bridge") {
+			#Création d'une interface en pont
+			& "$vboxmanage" modifyvm  "$nomvm" --nic"$rang" bridged
+			& "$vboxmanage" modifyvm  "$nomvm" --nictype"$rang" 82540EM
+			& "$vboxmanage" modifyvm  "$nomvm" --cableconnected"$rang" on
+			& "$vboxmanage" modifyvm  "$nomvm" --nicpromisc"$rang" allow-all
+			Write-Host "$nomvm : IF$rang $nic"
+		}
+		elseif ($nic -eq "int") {
+			#Création d'une interface en reseau interne
+			& "$vboxmanage" modifyvm  "$nomvm" --nic"$rang" intnet
+			& "$vboxmanage" modifyvm  "$nomvm" --intnet"$rang" "$reseau"
+			& "$vboxmanage" modifyvm  "$nomvm" --nictype"$rang" 82540EM
+			& "$vboxmanage" modifyvm  "$nomvm" --cableconnected"$rang" on
+			& "$vboxmanage" modifyvm  "$nomvm" --nicpromisc"$rang" allow-all
+			Write-Host "$nomvm : IF$rang $nic $reseau"
+		}
+	}
+}
+
+
 if ($args[0] -eq "s-adm") {
 
-#Importation depuis l'ova
+	create_vm $args[0]
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" import "$ovafile"  --vsys 0 --vmname "s-adm"
+	create_if $args[0] "bridge" 1 "null"
+	create_if $args[0] "int" 2 "n-adm"
 	
-#création de la première interface
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --nic1 bridged
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --nictype1 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --cableconnected1 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --nicpromisc1 allow-all
-
-#création de la deuxième interface
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --nic2 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --intnet2 "n-adm"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --nictype2 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --cableconnected2 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-adm" --nicpromisc2 allow-all
 }
 
 elseif ($args[0] -eq "s-infra") {
 
-#Importation depuis l'ova
+	create_vm $args[0]
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" import "$ovafile"  --vsys 0 --vmname "s-infra"
+	create_if $args[0] "int" 1 "n-adm"
+	create_if $args[0] "int" 2 "n-infra"
 
 #création de la première interface
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --nic1 intnet
+& "$vboxmanage" modifyvm  "s-infra" --nic1 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --intnet1 "n-adm"
+& "$vboxmanage" modifyvm  "s-infra" --intnet1 "n-adm"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --nictype1 82540EM
+& "$vboxmanage" modifyvm  "s-infra" --nictype1 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --cableconnected1 on
+& "$vboxmanage" modifyvm  "s-infra" --cableconnected1 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --nicpromisc1 allow-all
+& "$vboxmanage" modifyvm  "s-infra" --nicpromisc1 allow-all
 
 #création de la deuxième interface
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --nic2 intnet
+& "$vboxmanage" modifyvm  "s-infra" --nic2 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --intnet2 "n-infra"
+& "$vboxmanage" modifyvm  "s-infra" --intnet2 "n-infra"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --nictype2 82540EM
+& "$vboxmanage" modifyvm  "s-infra" --nictype2 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --cableconnected2 on
+& "$vboxmanage" modifyvm  "s-infra" --cableconnected2 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "s-infra" --nicpromisc2 allow-all
+& "$vboxmanage" modifyvm  "s-infra" --nicpromisc2 allow-all
 }
 
 elseif ($args[0] -eq "r-int") {
 
-#Importation depuis l'ova
+	create_vm($args[0])
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" import "$ovafile"  --vsys 0 --vmname "r-int"
 
 #interface 1
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nic1 intnet
+& "$vboxmanage" modifyvm  "r-int" --nic1 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --intnet1 "n-adm"
+& "$vboxmanage" modifyvm  "r-int" --intnet1 "n-adm"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nictype1 82540EM
+& "$vboxmanage" modifyvm  "r-int" --nictype1 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --cableconnected1 on
+& "$vboxmanage" modifyvm  "r-int" --cableconnected1 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nicpromisc1 allow-all
+& "$vboxmanage" modifyvm  "r-int" --nicpromisc1 allow-all
 
 #interface 2
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nic2 intnet
+& "$vboxmanage" modifyvm  "r-int" --nic2 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --intnet2 "n-link"
+& "$vboxmanage" modifyvm  "r-int" --intnet2 "n-link"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nictype2 82540EM
+& "$vboxmanage" modifyvm  "r-int" --nictype2 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --cableconnected2 on
+& "$vboxmanage" modifyvm  "r-int" --cableconnected2 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nicpromisc2 allow-all
+& "$vboxmanage" modifyvm  "r-int" --nicpromisc2 allow-all
 
 #interface 3
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nic3 intnet
+& "$vboxmanage" modifyvm  "r-int" --nic3 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --intnet3 "n-wifi"
+& "$vboxmanage" modifyvm  "r-int" --intnet3 "n-wifi"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nictype3 82540EM
+& "$vboxmanage" modifyvm  "r-int" --nictype3 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --cableconnected3 on
+& "$vboxmanage" modifyvm  "r-int" --cableconnected3 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nicpromisc3 allow-all
+& "$vboxmanage" modifyvm  "r-int" --nicpromisc3 allow-all
 
 #interface 4
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nic4 intnet
+& "$vboxmanage" modifyvm  "r-int" --nic4 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --intnet4 "n-user"
+& "$vboxmanage" modifyvm  "r-int" --intnet4 "n-user"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nictype4 82540EM
+& "$vboxmanage" modifyvm  "r-int" --nictype4 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --cableconnected4 on
+& "$vboxmanage" modifyvm  "r-int" --cableconnected4 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nicpromisc4 allow-all
+& "$vboxmanage" modifyvm  "r-int" --nicpromisc4 allow-all
 
 #interface 5
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nic5 intnet
+& "$vboxmanage" modifyvm  "r-int" --nic5 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --intnet5 "n-infra"
+& "$vboxmanage" modifyvm  "r-int" --intnet5 "n-infra"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nictype5 82540EM
+& "$vboxmanage" modifyvm  "r-int" --nictype5 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --cableconnected5 on
+& "$vboxmanage" modifyvm  "r-int" --cableconnected5 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-int" --nicpromisc5 allow-all
+& "$vboxmanage" modifyvm  "r-int" --nicpromisc5 allow-all
 }
 
 elseif ($args[0] -eq "r-ext") {
 
-#Importation depuis l'ova
+	create_vm($args[0])
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" import "$ovafile"  --vsys 0 --vmname "r-ext"
 
 #interface 1
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nic1 intnet
+& "$vboxmanage" modifyvm  "r-ext" --nic1 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --intnet1 "n-adm"
+& "$vboxmanage" modifyvm  "r-ext" --intnet1 "n-adm"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nictype1 82540EM
+& "$vboxmanage" modifyvm  "r-ext" --nictype1 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --cableconnected1 on
+& "$vboxmanage" modifyvm  "r-ext" --cableconnected1 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nicpromisc1 allow-all
+& "$vboxmanage" modifyvm  "r-ext" --nicpromisc1 allow-all
 
 #interface 2
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nic2 intnet
+& "$vboxmanage" modifyvm  "r-ext" --nic2 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --intnet2 "n-dmz"
+& "$vboxmanage" modifyvm  "r-ext" --intnet2 "n-dmz"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nictype2 82540EM
+& "$vboxmanage" modifyvm  "r-ext" --nictype2 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --cableconnected2 on
+& "$vboxmanage" modifyvm  "r-ext" --cableconnected2 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nicpromisc2 allow-all
+& "$vboxmanage" modifyvm  "r-ext" --nicpromisc2 allow-all
 
 #interface 3
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nic3 bridged
+& "$vboxmanage" modifyvm  "r-ext" --nic3 bridged
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nictype3 82540EM
+& "$vboxmanage" modifyvm  "r-ext" --nictype3 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --cableconnected3 on
+& "$vboxmanage" modifyvm  "r-ext" --cableconnected3 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nicpromisc3 allow-all
+& "$vboxmanage" modifyvm  "r-ext" --nicpromisc3 allow-all
 
 #interface 4
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nic4 intnet
+& "$vboxmanage" modifyvm  "r-ext" --nic4 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --intnet4 "n-linkv"
+& "$vboxmanage" modifyvm  "r-ext" --intnet4 "n-linkv"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nictype4 82540EM
+& "$vboxmanage" modifyvm  "r-ext" --nictype4 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --cableconnected4 on
+& "$vboxmanage" modifyvm  "r-ext" --cableconnected4 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nicpromisc4 allow-all
+& "$vboxmanage" modifyvm  "r-ext" --nicpromisc4 allow-all
 
 #interface 5
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nic5 intnet
+& "$vboxmanage" modifyvm  "r-ext" --nic5 intnet
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --intnet5 "n-link"
+& "$vboxmanage" modifyvm  "r-ext" --intnet5 "n-link"
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nictype5 82540EM
+& "$vboxmanage" modifyvm  "r-ext" --nictype5 82540EM
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --cableconnected5 on
+& "$vboxmanage" modifyvm  "r-ext" --cableconnected5 on
-& "C:\Program Files\Oracle\VirtualBox\VBoxManage.exe" modifyvm  "r-ext" --nicpromisc5 allow-all
+& "$vboxmanage" modifyvm  "r-ext" --nicpromisc5 allow-all
+}
+
+elseif ($args[0] -eq "test") {
+
+fonction1 $args[0] $args[1]
 }

scripts/r-vp1-post.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+#stoper le fw
+systemctl stop ferm
+#ouverture du service web pour copie distante
+cd /root/confwg/ && python3 -m http.server 8000 &

scripts/r-vp2-post.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+#recuperation du fichier de config
+wget http://r-vp1.gsb.adm:8000/wg0-b.qconf
+#renomage fichier et mv
+mv ./wg0-b.conf /etc/wireguard/wg0.conf