upgrade bookworm

This commit is contained in:
Fanch 2025-01-05 19:04:19 +01:00
parent 5dff08c44d
commit ff7644a32a
9 changed files with 45 additions and 26 deletions

2
Vagrantfile vendored
View File

@ -8,7 +8,7 @@
# you're doing. # you're doing.
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "debian/bullseye64" config.vm.box = "debian/bookworm64"
config.vm.hostname = 'kaz-vm' config.vm.hostname = 'kaz-vm'
config.vm.provider "virtualbox" do |vb| config.vm.provider "virtualbox" do |vb|

View File

@ -5,9 +5,13 @@ if [ -z $SNSTERGUARD ] ; then exit 1; fi
DIR=`dirname $0` DIR=`dirname $0`
cd `dirname $0` cd `dirname $0`
# disable systemd-resolved which conflicts with nsd DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
echo "DNSStubListener=no" >> /etc/systemd/resolved.conf if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
systemctl stop systemd-resolved 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 update
DEBIAN_FRONTEND=noninteractive apt-get remove -y apache2 DEBIAN_FRONTEND=noninteractive apt-get remove -y apache2

View File

@ -5,9 +5,13 @@ if [ -z $SNSTERGUARD ] ; then exit 1; fi
DIR=`dirname $0` DIR=`dirname $0`
cd `dirname $0` cd `dirname $0`
# disable systemd-resolved which conflicts with nsd DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
echo "DNSStubListener=no" >> /etc/systemd/resolved.conf if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
systemctl stop systemd-resolved 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 update
DEBIAN_FRONTEND=noninteractive apt-get remove -y apache2 DEBIAN_FRONTEND=noninteractive apt-get remove -y apache2

View File

@ -7,13 +7,17 @@ cd `dirname $0`
# Email's mail account email@isp-a.sns # Email's mail account email@isp-a.sns
useradd -m -s "/bin/bash" -p `mkpasswd --method=sha-512 email` email || true useradd -m -s "/bin/bash" -p `mkpasswd --method=sha-512 email` email || true
addgroup email mail adduser email mail
#mkdir /home/hacker/mail #mkdir /home/hacker/mail
#touch /home/hacker/mail/Drafts /home/hacker/mail/Queue /home/hacker/mail/Sent /home/hacker/mail/Trash #touch /home/hacker/mail/Drafts /home/hacker/mail/Queue /home/hacker/mail/Sent /home/hacker/mail/Trash
# disable systemd-resolved which conflicts with nsd DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
echo "DNSStubListener=no" >> /etc/systemd/resolved.conf if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
systemctl stop systemd-resolved 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 # manage isp-a.sns zone
apt-get update apt-get update

View File

@ -7,14 +7,14 @@ header:
config: config:
prefix: kaz prefix: kaz
nat-bridge: lxcbr0 nat-bridge: lxcbr0
default-master: bullseye default-master: bookworm
masters: masters:
bullseye: bookworm:
backend: lxc backend: lxc
template: debian template: debian
parameters: parameters:
release: bullseye release: bookworm
arch: amd64 arch: amd64
family: debian family: debian
@ -23,9 +23,8 @@ masters:
template: download template: download
parameters: parameters:
dist: alpine dist: alpine
release: 3.18 release: 3.21
arch: amd64 arch: amd64
no-validate: true
family: alpine family: alpine
disabled-groups: disabled-groups:

View File

@ -5,9 +5,13 @@ if [ -z $SNSTERGUARD ] ; then exit 1; fi
DIR=`dirname $0` DIR=`dirname $0`
cd `dirname $0` cd `dirname $0`
# disable systemd-resolved which conflicts with nsd DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
echo "DNSStubListener=no" >> /etc/systemd/resolved.conf if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
systemctl stop systemd-resolved then
# disable systemd-resolved which conflicts with nsd
echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
systemctl stop systemd-resolved
fi
# manage mica.sns zone # manage mica.sns zone
apt-get update apt-get update

View File

@ -6,9 +6,13 @@ if [ -z $SNSTERGUARD ] ; then exit 1; fi
DIR=`dirname $0` DIR=`dirname $0`
cd `dirname $0` cd `dirname $0`
# disable systemd-resolved which conflicts with nsd DEB_VERSION=`cat /etc/debian_version | cut -d'.' -f1`
echo "DNSStubListener=no" >> /etc/systemd/resolved.conf if [ $DEB_VERSION -eq "11" ] # DEB 11 aka Bullseye
systemctl stop systemd-resolved then
# disable systemd-resolved which conflicts with nsd
echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
systemctl stop systemd-resolved
fi
apt-get update apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y nsd DEBIAN_FRONTEND=noninteractive apt-get install -y nsd

View File

@ -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) # 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) # This metric must be lower than the one exported by BGP for the default route (static part below)
mkdir /etc/udhcpc mkdir -p /etc/udhcpc
echo "IF_METRIC=200" > /etc/udhcpc/udhcpc.conf echo "IF_METRIC=200" >> /etc/udhcpc/udhcpc.conf
# customize bird config (BGP) # customize bird config (BGP)

View File

@ -177,7 +177,7 @@ auth:
git clone https://framagit.org/flesueur/snster.git git clone https://framagit.org/flesueur/snster.git
cd snster cd snster
# git checkout tags/v1.1.0 # git checkout tags/v1.1.0
git checkout fe59ef1f git checkout 34b7c57cb7480cb4b3a84d14a1a46b60d0eb5967
./install.sh ./install.sh
# BTRFS avec hotfix sale de SNSTER # BTRFS avec hotfix sale de SNSTER
@ -187,7 +187,7 @@ auth:
mkfs.btrfs -f /root/btrfs.img mkfs.btrfs -f /root/btrfs.img
echo "/root/btrfs.img /var/lib/lxc btrfs loop 0 0" >> /etc/fstab echo "/root/btrfs.img /var/lib/lxc btrfs loop 0 0" >> /etc/fstab
mount /var/lib/lxc 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 # SNSTER KAZ
cp -ar ${VAGRANT_SRC_DIR}/snster-kaz /root cp -ar ${VAGRANT_SRC_DIR}/snster-kaz /root