upgrade bookworm

bump alpine version
fix variés
2025-01-05 19:04:19 +01:00 · 2024-12-24 11:58:34 +01:00 · 2024-12-24 11:42:25 +01:00 · 2023-10-02 17:19:53 +02:00 · 2023-10-02 16:33:28 +02:00 · 2023-10-02 16:31:40 +02:00
13 changed files with 57 additions and 51 deletions
--- a/README.md
+++ b/README.md
@ -1,7 +1,6 @@
 # kaz-vagrant

 [Kaz](https://kaz.bzh/) est un CHATONS du Morbihan. Nous proposons ici un moyen de le répliquer dans une VM. Il y a des éléments de configuration à définir avant d'initialiser ce simulateur. 
-
 Le principe est de faire fonctionner un simulateur de notre CHATONS dans une VirtualBox pour mettre au point nos différents services.

 Nous utilisons :
@ -46,6 +45,8 @@ Les utilisateurs créés sont
  * debian/debian
  * root/root.

+Se connecter en root/root
+
 Lors du démarrage de la VM, il faut lancer SNSTER :
 ```bash
 cd /root/snster-kaz
@ -75,6 +76,8 @@ Vous pouvez alors (toutes les commandes snster doivent être exécutées dans `/
  * `/kaz` [VM] correspond à `/kaz` [hoster-a-kaz1]
 * Il est probablement pratique d'installer son environnement de développement sur la VM, avec ses clés SSH et son éditeur favori.

+Dans Vagrantfile, existent des répertoires partagés entre le host et le VM mais pour qu'ils soient visibles depuis la VM, il faut démarrer la VM non pas avec VirtualBox mais avec Vagrant up.
+
 Il y a un aperçu de l'état des services avec l'url https://kaz.sns/status/allServices.html

 ![status](/doc/images/allServices.jpg)
--- a/20
+++ b/20
@ -2,32 +2,14 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :

-unless Vagrant.has_plugin?("vagrant-disksize")
-  raise  Vagrant::Errors::VagrantError.new, "vagrant-disksize plugin is missing. Please install it using 'vagrant plugin install vagrant-disksize' and rerun 'vagrant up'"
-end
-
 # All Vagrant configuration is done below. The "2" in Vagrant.configure
 # configures the configuration version (we support older styles for
 # backwards compatibility). Please don't change it unless you know what
 # you're doing.
 Vagrant.configure("2") do |config|

-  required_plugins = %w( vagrant-disksize )
-  _retry = false
-  required_plugins.each do |plugin|
-    unless Vagrant.has_plugin? plugin
-      system "vagrant plugin install #{plugin}"
-      _retry=true
-    end
-  end
-
-  if (_retry)
-    exec "vagrant " + ARGV.join(' ')
-  end
-
-  config.vm.box = "debian/bullseye64"
+  config.vm.box = "debian/bookworm64"
  config.vm.hostname = 'kaz-vm'
-  config.disksize.size = '50GB'

  config.vm.provider "virtualbox" do |vb|
    vb.memory = "4096"
--- a/files/snster-kaz/hoster-a/kaz1/kaz-config/container-proxy.list
+++ b/files/snster-kaz/hoster-a/kaz1/kaz-config/container-proxy.list
@ -1,2 +1,2 @@
-proxy
-#traefik
+#proxy
+traefik
--- a/files/snster-kaz/hoster-a/kaz1/kaz.sh
+++ b/files/snster-kaz/hoster-a/kaz1/kaz.sh
@ -24,7 +24,7 @@ export DebugLog="${OUTPUT_DIR}/log/log-kaz-$(date +%y-%m-%d-%T)-"

    # copie des sources
    cd /
-    git clone https://git.kaz.bzh/KAZ/kaz.git
+    git clone https://git.kaz.bzh/KAZ/KazV2.git kaz
    (cd /kaz ; git checkout "${KAZBRANCH}" )

    cp "${DIR}/kaz-config/dockers.env" /kaz/config/dockers.env
--- a/files/snster-kaz/hoster-a/kaz1/provision.sh
+++ b/files/snster-kaz/hoster-a/kaz1/provision.sh
@ -5,9 +5,13 @@ if [ -z $SNSTERGUARD ] ; then exit 1; fi
 DIR=`dirname $0`
 cd `dirname $0`

+DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
+if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
+then
 	# disable systemd-resolved which conflicts with nsd
 	echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
 	systemctl stop systemd-resolved
+fi

 DEBIAN_FRONTEND=noninteractive apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get remove -y apache2
--- a/files/snster-kaz/hoster-b/kaz2/kaz.sh
+++ b/files/snster-kaz/hoster-b/kaz2/kaz.sh
@ -24,7 +24,7 @@ export DebugLog="${OUTPUT_DIR}/log/log-kaz-$(date +%y-%m-%d-%T)-"

    # copie des sources
    cd /
-    git clone https://git.kaz.bzh/KAZ/kaz.git
+    git clone https://git.kaz.bzh/KAZ/KazV2.git kaz
    (cd /kaz ; git checkout "${KAZBRANCH}" )

    cp "${DIR}/kaz-config/dockers.env" /kaz/config/dockers.env
--- a/files/snster-kaz/hoster-b/kaz2/provision.sh
+++ b/files/snster-kaz/hoster-b/kaz2/provision.sh
@ -5,9 +5,13 @@ if [ -z $SNSTERGUARD ] ; then exit 1; fi
 DIR=`dirname $0`
 cd `dirname $0`

+DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
+if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
+then
 	# disable systemd-resolved which conflicts with nsd
 	echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
 	systemctl stop systemd-resolved
+fi

 DEBIAN_FRONTEND=noninteractive apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get remove -y apache2
--- a/files/snster-kaz/isp-a/infra/provision.sh
+++ b/files/snster-kaz/isp-a/infra/provision.sh
@ -7,13 +7,17 @@ cd `dirname $0`

 # Email's mail account email@isp-a.sns
 useradd -m -s "/bin/bash" -p `mkpasswd --method=sha-512 email` email || true
-addgroup email mail
+adduser email mail
 #mkdir /home/hacker/mail
 #touch /home/hacker/mail/Drafts /home/hacker/mail/Queue /home/hacker/mail/Sent /home/hacker/mail/Trash

+DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
+if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
+then
 	# disable systemd-resolved which conflicts with nsd
 	echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
 	systemctl stop systemd-resolved
+fi

 # manage isp-a.sns zone
 apt-get update
--- a/files/snster-kaz/main.yml
+++ b/files/snster-kaz/main.yml
@ -7,14 +7,14 @@ header:
 config:
  prefix: kaz
  nat-bridge: lxcbr0
-  default-master: bullseye
+  default-master: bookworm

 masters:
-  bullseye:
+  bookworm:
    backend: lxc
    template: debian
    parameters:
-      release: bullseye
+      release: bookworm
      arch: amd64
    family: debian

@ -23,9 +23,8 @@ masters:
    template: download
    parameters:
      dist: alpine
-      release: 3.14
+      release: 3.21
      arch: amd64
-      no-validate: true
    family: alpine

 disabled-groups:
--- a/files/snster-kaz/mica/infra/provision.sh
+++ b/files/snster-kaz/mica/infra/provision.sh
@ -5,9 +5,13 @@ if [ -z $SNSTERGUARD ] ; then exit 1; fi
 DIR=`dirname $0`
 cd `dirname $0`

+DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
+if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
+then
 	# disable systemd-resolved which conflicts with nsd
 	echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
 	systemctl stop systemd-resolved
+fi

 # manage mica.sns zone
 apt-get update
--- a/files/snster-kaz/tld-sns/ns/provision.sh
+++ b/files/snster-kaz/tld-sns/ns/provision.sh
@ -6,9 +6,13 @@ if [ -z $SNSTERGUARD ] ; then exit 1; fi
 DIR=`dirname $0`
 cd `dirname $0`

+DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
+if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
+then
 	# disable systemd-resolved which conflicts with nsd
 	echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
 	systemctl stop systemd-resolved
+fi

 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get install -y nsd
--- a/files/snster-kaz/transit-a/router/provision.sh
+++ b/files/snster-kaz/transit-a/router/provision.sh
@ -20,8 +20,8 @@ touch /etc/network/keepdhcp

 # Force lxc bridged interface metric (else, it grows to 200+interface_index, which can be large with successive  stop/start)
 # This metric must be lower than the one exported by BGP for the default route (static part below)
-mkdir /etc/udhcpc
-echo "IF_METRIC=200" > /etc/udhcpc/udhcpc.conf
+mkdir -p /etc/udhcpc
+echo "IF_METRIC=200" >> /etc/udhcpc/udhcpc.conf


 # customize bird config (BGP)
@ -38,3 +38,5 @@ protocol static {
 # Add dnsmasq for external dns
 apk add dnsmasq
 rc-update add dnsmasq
+# dnsmasq listen on eth1
+echo "interface=eth1" >> /etc/dnsmasq.conf
--- a/files/vm-provision.sh
+++ b/files/vm-provision.sh
@ -177,7 +177,7 @@ auth:
    git clone https://framagit.org/flesueur/snster.git
    cd snster
    # git checkout tags/v1.1.0
-    git checkout fe59ef1f
+    git checkout 34b7c57cb7480cb4b3a84d14a1a46b60d0eb5967
    ./install.sh

    # BTRFS avec hotfix sale de SNSTER
@ -187,7 +187,7 @@ auth:
    mkfs.btrfs -f /root/btrfs.img
    echo "/root/btrfs.img	/var/lib/lxc	btrfs	loop	0	0" >> /etc/fstab
    mount /var/lib/lxc
-    sed -i -e "s/template=self.template/template=self.template, bdevtype='btrfs'/" /usr/local/lib/python3.9/dist-packages/backends/LxcBackend.py
+    sed -i -e "s/template=self.template/template=self.template, bdevtype='btrfs'/" /usr/local/lib/python3.11/dist-packages/backends/LxcBackend.py

    # SNSTER KAZ
    cp -ar ${VAGRANT_SRC_DIR}/snster-kaz /root
@ -202,7 +202,7 @@ auth:
    # On lie le filesystem de kaz-prod dans le /kaz de la VM pour le dév
    ln -s /var/lib/lxc/kaz-hoster-a-kaz1/rootfs/ /kaz1-prod
    ln -s /var/lib/lxc/kaz-hoster-b-kaz2/rootfs/ /kaz2-prod
-    ln -s /kaz-prod/kaz /kaz
+    ln -s /kaz-prod1/kaz /kaz

    # On met le KAZGUARD pour la mise au point
    echo "export KAZGUARD='true'" >> /root/.bashrc
Author	SHA1	Message	Date
Fanch	ff7644a32a	upgrade bookworm	2025-01-05 19:04:19 +01:00
Fanch	5dff08c44d	bump alpine version	2024-12-24 11:58:34 +01:00
Fanch	5aff69a05a	fix variés	2024-12-24 11:42:25 +01:00
fabrice.regnier	9dc73bf077	maj README	2023-10-02 17:19:53 +02:00
fabrice.regnier	cf2b702eb5	on vire test_fab	2023-10-02 16:33:28 +02:00
fabrice.regnier	23d03f8ba0	test commit	2023-10-02 16:31:40 +02:00
fabrice.regnier	5ed8b36c28	modif du lien /kaz/ de la VM	2023-10-02 16:29:28 +02:00
Gael	3cd5d20de6	Problème de dns non forwardé	2023-05-31 16:57:24 +02:00
fab	2685f7bb11	Mise à jour de 'files/snster-kaz/main.yml' alpine de 3.14 à 3.17 après un plantage dans un vagrant up	2023-05-30 16:32:05 +02:00