Maj doc pour 2024

commente syslog-cli pour r-*
comment syslog-cli
2023-12-21 19:11:54 +01:00 · 2023-12-21 15:28:53 +01:00 · 2023-12-21 15:14:59 +01:00 · 2023-12-21 15:06:38 +01:00 · 2023-12-21 14:46:12 +01:00 · 2023-12-21 14:37:43 +01:00
29 changed files with 49 additions and 46 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # gsb2024
-2024-12-18 ps
+2024-12-19 ps
 Environnement et playbooks ansible pour le projet GSB 2024
@@ -8,8 +8,8 @@ Environnement et playbooks ansible pour le projet GSB 2024
 Prérequis : 
  * une machine Debian Bookworm
  * VirtualBox
-  * fichier machines viruelles **ova** :
+  * fichier machines virtuelles **ova** :
-    * **debian-bullseye-gsb-2023a.ova**
+    * **debian-bookworm-gsb-2023c.ova**
    * **debian-buster-gsb-2023a.ova**
@@ -42,8 +42,8 @@ Prérequis :
 ## Installation
 On utilisera les images de machines virtuelle suivantes : 
-  * **debian-biookworm-2023c.ova** (2024-12-18)
+  * **debian-bookworm-gsb-2023c.ova** (2023-12-18)
-    * Debian Bullseye 12.4 - 2 cartes - 1 Go - Stockage 20 Go
+    * Debian Bookworm 12.4 - 2 cartes - 1 Go - Stockage 20 Go
 et pour **s-fog** : 
  * **debian-buster-2023a.ova** (2023-01-06)
@@ -81,7 +81,7 @@ bash chname <nouveau_nom_de_machine>` , puis redémarrer
    bash inst-depl
    cd /var/www/html/gsbstore
    bash getall
-    cd /root/tools/ansible/gsb023/pre
+    cd /root/tools/ansible/gsb024/pre
    bash gsbboot
    cd .. ; bash pull-config
 ```
@@ -96,7 +96,7 @@ bash chname <nouveau_nom_de_machine>` , puis redémarrer
  - ou sinon:
 ```shell
 mkdir -p tools/ansible ; cd tools/ansible
-git clone https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git
+git clone https://gitea.lyc-lecastel.fr/gsb/gsb2024.git
 cd gsb2024/pre
 export DEPL=192.168.99.99
 bash gsbboot
--- a/pre/mkmaster.sh
+++ b/pre/mkmaster.sh
@@ -3,11 +3,11 @@
 apt update
 apt install -y curl sudo wget vim git ansible
 timedatectl set-timezone Europe/Paris
-echo bookworm64 > /etc/hostname
+echo bookworm > /etc/hostname
-cat > /etc/hosts <EOT
+cat > /etc/hosts << EOT
 127.0.0.1       localhost
-127.0.1.1       bookworm64 
+127.0.1.1       bookworm 
 127.0.0.1       localhost ip6-localhost ip6-loopback
 EOT
--- a/r-ext.yml
+++ b/r-ext.yml
@@ -8,5 +8,5 @@
   - r-ext
   - snmp-agent
   - ssh-cli
-   - syslog-cli
+   # - syslog-cli
   - post
--- a/r-int.yml
+++ b/r-int.yml
@@ -7,7 +7,7 @@
   - goss
   - r-int
   - ssh-cli
-   - syslog-cli
+   # - syslog-cli
   - dhcp
   - snmp-agent
   - post
--- a/r-vp1.yml
+++ b/r-vp1.yml
@@ -15,5 +15,5 @@
   - post
   - wireguard-r
   - ssh-cli
-   - syslog-cli
+   # - syslog-cli
--- a/r-vp2.yml
+++ b/r-vp2.yml
@@ -18,4 +18,4 @@
   - wireguard-l
   - post
   - ssh-cli
-   - syslog-cli
+   # - syslog-cli
--- a/roles/base/files/sources.list
+++ b/roles/base/files/sources.list
@@ -1,10 +1,4 @@
-# 
+deb https://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
-
+deb https://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
-deb http://ftp.fr.debian.org/debian/ wheezy main contrib non-free
+deb https://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
 deb http://security.debian.org/ wheezy/updates main
 deb http://ftp.fr.debian.org/debian/ wheezy-updates main
 deb http://http.debian.net/debian wheezy-backports main
--- a/roles/base/files/sources.list.Debian
+++ b/roles/base/files/sources.list.Debian
@@ -1,4 +1,4 @@
-deb http://deb.debian.org/debian/ bullseye main non-free contrib
+deb https://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
-deb http://security.debian.org/debian-security bullseye-security main contrib non-free
+deb https://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
-deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
+deb https://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
--- a/roles/base/files/sources.list.bookworm
+++ b/roles/base/files/sources.list.bookworm
@@ -0,0 +1,4 @@
 deb https://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
 deb https://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
 deb https://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
--- a/roles/base/files/sources.list.bullseye
+++ b/roles/base/files/sources.list.bullseye
@@ -0,0 +1,4 @@
 deb http://deb.debian.org/debian/ bullseye main non-free contrib
 deb http://security.debian.org/debian-security bullseye-security main contrib non-free
 deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
--- a/s-adm.yml
+++ b/s-adm.yml
@@ -9,6 +9,6 @@
    - squid
 #    - local-store
    - snmp-agent
-    - syslog-cli
+    ## - syslog-cli
    - post
 #    - goss
--- a/s-agence.yml
+++ b/s-agence.yml
@@ -5,6 +5,6 @@
  roles:
    - base
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
    - goss
--- a/s-appli.yml
+++ b/s-appli.yml
@@ -7,7 +7,7 @@
    - goss
    - appli
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - snmp-agent
    - ssl-apache
    - post
--- a/s-backup.yml
+++ b/s-backup.yml
@@ -8,7 +8,7 @@
 #   - proxy3
    - snmp-agent
 #   - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - smb-backup
    - dns-slave
    - post
--- a/s-docker.yml
+++ b/s-docker.yml
@@ -7,7 +7,7 @@
    - goss
    - snmp-agent
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - docker-openvas-ab
      #- docker-iredmail-ab
    - post
--- a/s-elk.yml
+++ b/s-elk.yml
@@ -7,5 +7,5 @@
    - docker
    - elk
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
--- a/s-fog.yml
+++ b/s-fog.yml
@@ -8,6 +8,6 @@
    - dhcp-fog
    - ssh-cli
    - snmp-agent
-    - syslog-cli
+    # - syslog-cli
    - fog
    - post
--- a/s-gestsup.yml
+++ b/s-gestsup.yml
@@ -7,6 +7,6 @@
    - gestsup
    - postfix-gestsup
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - snmp-agent
    - post
--- a/s-infra.yml
+++ b/s-infra.yml
@@ -8,7 +8,7 @@
    - dns-master
    - webautoconf
    - snmp-agent
-    - syslog-cli
+    # - syslog-cli
    - ssh-cli
    - post
--- a/s-itil.yml
+++ b/s-itil.yml
@@ -16,5 +16,5 @@
    - snmp-agent
    - glpi
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
--- a/s-mess.yml
+++ b/s-mess.yml
@@ -6,6 +6,6 @@
    - base
    - docker-nextcloud
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - snmp-agent
    - post
--- a/s-nas.yml
+++ b/s-nas.yml
@@ -12,5 +12,5 @@
    - snmp-agent
    - lb-nfs-server
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
--- a/s-nxc.yml
+++ b/s-nxc.yml
@@ -7,6 +7,6 @@
    - docker
    - nxc-traefik
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - snmp-agent
    - post
--- a/s-proxy.yml
+++ b/s-proxy.yml
@@ -8,5 +8,5 @@
    - squid
    - snmp-agent
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
--- a/s-test.yml
+++ b/s-test.yml
@@ -6,7 +6,7 @@
    - base
    - goss
    - snmp-agent
-    - syslog-cli
+    # - syslog-cli
    - ssh-cli
    - post
--- a/scripts/debian11/chname
+++ b/scripts/debian11/chname
--- a/scripts/debian11/gsb-start
+++ b/scripts/debian11/gsb-start
@@ -3,8 +3,8 @@ apt-get  update
 #upgrade -y
 mkdir -p /root/tools/ansible
 cd /root/tools/ansible
-git clone https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git
+git clone https://gitea.lyc-lecastel.fr/gsb/gsb2024.git
-cd gsb2023/pre
+cd gsb2024/pre
 export DEPL=192.168.99.99
 bash gsbboot
 cd ../..
--- a/scripts/mkvm
+++ b/scripts/mkvm
@@ -1,10 +1,11 @@
 #!/bin/bash
-mkvmrelease="v1.2.2"
+mkvmrelease="v1.2.3"
-ovarelease="2023b"
+ovarelease="2023c"
 ovafogrelease="2023b"
-ovafile="$HOME/Téléchargements/debian-bullseye-gsb-${ovarelease}.ova"
+#ovafile="$HOME/Téléchargements/debian-bullseye-gsb-${ovarelease}.ova"
 ovafile="$HOME/Téléchargements/debian-bookworm-gsb-${ovarelease}.ova"
 ovafilefog="$HOME/Téléchargements/debian-buster-gsb-${ovafogrelease}.ova"
 deletemode=0
--- a/scripts/debian11/s-adm-start
+++ b/scripts/debian11/s-adm-start
Author	SHA1	Message	Date
Auguste Bedloe	26ebf4899b	Maj doc pour 2024	2023-12-21 19:11:54 +01:00
Alhassane Kone	21d6a77ffa	commente syslog-cli pour r-*	2023-12-21 15:28:53 +01:00
sio user	23b480e9fd	comment syslog-cli	2023-12-21 15:14:59 +01:00
sio user	9f99511968	gsb-start...	2023-12-21 15:06:38 +01:00
sio user	cceccda12b	comment syslog-cli	2023-12-21 14:46:12 +01:00
sio user	36a6850a52	MAJ pour bookworm	2023-12-21 14:37:43 +01:00
sio user	d14bf44b2b	Modif Nom VM dans mkvm	2023-12-21 14:23:29 +01:00
sio user	a4fd46609d	scripts de debian11 vers niv. sup.	2023-12-19 14:01:12 +01:00
sio user	1b2c6a9220	README + mkmaster ...	2023-12-19 13:54:29 +01:00