files/snster-kaz/transit-a/router/provision.sh

@@ -33,8 +33,3 @@ protocol static {
 	route 0.0.0.0/0 via 100.64.0.1;
 }
 " >> /etc/bird.conf
-
-
-# Add dnsmasq for external dns
-apk add dnsmasq
-rc-update add dnsmasq

files/vm-provision.sh

@@ -191,6 +191,17 @@ EOF
     cp -ar /etc/letsencrypt /root/snster-kaz/kaz/prod/
     cp -ar /etc/letsencrypt /root/snster-kaz/isp-a/home/
 
+    # Build SNSTER KAZ !
+    snster -c /root/snster-kaz create
+    cp "${VAGRANT_SRC_DIR}/vm-install-kaz.sh" /root/
+    chmod +x /root/vm-install-kaz.sh
+    if [ "${NOKAZ}" == "true" ]; then
+      echo "on ne fait pas l'install de kaz sur kaz-prod"
+    else
+      echo "on installe kaz sur kaz-prod"
+      bash "/root/vm-install-kaz.sh"
+    fi
+
     # On monte le filesystem de kaz-prod dans le /kaz de la VM pour le dév (en nofail)
     mkdir /kaz-prod /kaz
     echo "overlay	/kaz-prod	overlay	lowerdir=/var/lib/lxc/sr-masters-bullseye/rootfs,upperdir=/var/lib/lxc/kaz-kaz-prod/overlay/delta,workdir=/var/lib/lxc/kaz-kaz-prod/overlay/work,nofail  0 0" >> /etc/fstab
@@ -199,19 +210,6 @@ EOF
     # On met le KAZGUARD pour la mise au point
     echo "export KAZGUARD='true'" >> /root/.bashrc
 
-    # Build SNSTER KAZ !
-    snster -c /root/snster-kaz create
-    cp "${VAGRANT_SRC_DIR}/vm-install-kaz.sh" /root/
-    chmod +x /root/vm-install-kaz.sh
-    cp "${VAGRANT_SRC_DIR}/vm-upgrade.sh" /root/
-    chmod +x /root/vm-upgrade.sh
-    if [ "${NOKAZ}" == "true" ]; then
-      echo "on ne fait pas l'install de kaz sur kaz-prod"
-    else
-      echo "on installe kaz sur kaz-prod"
-      bash "/root/vm-install-kaz.sh"
-    fi
-
     echo "########## ********** End Vagrant $(date +%D-%T)"
 )  > >(tee ${DebugLog}stdout.log) 2> >(tee ${DebugLog}stderr.log >&2)
 

files/vm-upgrade.sh

@@ -1,45 +0,0 @@
-#!/bin/bash
-# Upgrade de tout sauf kaz-prod
-
-if [ -z "${KAZGUARD}" ] ; then
-    exit 1
-fi
-set -e
-
-# On met à jour SNSTER
-cd /root/snster
-git switch main
-git pull
-./install.sh
-
-# On récupère le dernier kaz-vagrant
-cd /tmp
-git clone https://git.kaz.bzh/KAZ/kaz-vagrant.git || (cd kaz-vagrant && git pull)
-cd /tmp/kaz-vagrant
-git switch develop-snster
-
-# On écrase les anciens fichiers
-cp -ar /tmp/kaz-vagrant/files/snster-kaz /root/
-# crypto keys
-cp -ar /etc/letsencrypt /root/snster-kaz/kaz/prod/
-cp -ar /etc/letsencrypt /root/snster-kaz/isp-a/home/
-
-# On détruit et reconstruit tout sauf kaz-prod
-SNSTER="snster -c /root/snster-kaz"
-$SNSTER destroy isp-a-home
-$SNSTER destroy isp-a-infra
-$SNSTER destroy isp-a-router
-$SNSTER destroy kaz-router
-$SNSTER destroy mica-router
-$SNSTER destroy mica-infra
-$SNSTER destroy opendns-router
-$SNSTER destroy opendns-resolver
-$SNSTER destroy root-p-router
-$SNSTER destroy root-p-rootns
-$SNSTER destroy tld-sns-router
-$SNSTER destroy tld-sns-ns
-$SNSTER destroy transit-a-router
-
-$SNSTER create
-
-$SNSTER start