From 5d4e4c3daeddfa510aa50198070acc3b8f5e5cfb Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sun, 9 May 2021 16:07:15 +0200 Subject: [PATCH] Prepare VM config for podman --- vm.sh | 8 ++++---- vm/etc/apk/repositories | 8 +++++--- vm/etc/hosts | 1 - vm/etc/network/interfaces | 8 -------- vm/etc/postfix/main.cf | 2 +- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/vm.sh b/vm.sh index 65b4521..e839032 100755 --- a/vm.sh +++ b/vm.sh @@ -14,8 +14,8 @@ echo # Set up repositories cat </etc/apk/repositories -http://dl-cdn.alpinelinux.org/alpine/v3.12/main -http://dl-cdn.alpinelinux.org/alpine/v3.12/community +http://dl-cdn.alpinelinux.org/alpine/v3.13/main +http://dl-cdn.alpinelinux.org/alpine/v3.13/community EOF # Install disk management tools @@ -89,9 +89,9 @@ apk --no-cache add apache2-utils gettext wget https://repo.spotter.cz/vm.tar.gz -O - | tar xzf - -C /mnt envsubst /mnt/boot/extlinux.conf.new mv /mnt/boot/extlinux.conf.new /mnt/boot/extlinux.conf -chroot /mnt apk --no-cache add bridge ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc logrotate lxc postfix nginx openssh-server openssh-sftp-server util-linux spoc@vm vmmgr@vm +chroot /mnt apk --no-cache add ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc logrotate postfix nginx openssh-server openssh-sftp-server util-linux podman@edgecommunity spoc@spotter vmmgr@spotter chroot /mnt newaliases -for SERVICE in cgroups consolefont crond iptables networking nginx ntpd postfix spoc swap urandom vmmgr; do +for SERVICE in consolefont crond iptables networking nginx ntpd podman postfix spoc swap urandom vmmgr; do ln -s /etc/init.d/${SERVICE} /mnt/etc/runlevels/boot done ADMINPWD=$(htpasswd -bnBC 10 '' "${ENCPWD}" | tr -d ':\n' | sed 's/$2y/$2b/') envsubst /mnt/etc/vmmgr/config.json.new diff --git a/vm/etc/apk/repositories b/vm/etc/apk/repositories index b344542..1cbf4d0 100644 --- a/vm/etc/apk/repositories +++ b/vm/etc/apk/repositories @@ -1,3 +1,5 @@ -http://dl-cdn.alpinelinux.org/alpine/v3.12/main -http://dl-cdn.alpinelinux.org/alpine/v3.12/community -@vm https://repo.spotter.cz/alpine/v3.12/apk +http://dl-cdn.alpinelinux.org/alpine/v3.13/main +http://dl-cdn.alpinelinux.org/alpine/v3.13/community +@edge http://dl-cdn.alpinelinux.org/alpine/edge/main +@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community +@spotter https://repo.spotter.cz/alpine/v3.13/apk diff --git a/vm/etc/hosts b/vm/etc/hosts index 18460db..77c24a1 100644 --- a/vm/etc/hosts +++ b/vm/etc/hosts @@ -1,3 +1,2 @@ 127.0.0.1 localhost ::1 localhost -172.17.0.1 host diff --git a/vm/etc/network/interfaces b/vm/etc/network/interfaces index 1704644..5f905ce 100644 --- a/vm/etc/network/interfaces +++ b/vm/etc/network/interfaces @@ -4,14 +4,6 @@ iface lo inet loopback auto eth0 iface eth0 inet dhcp -auto spocbr0 -iface spocbr0 inet static - address 172.17.0.1 - netmask 255.255.0.0 - bridge_fd 0 - bridge_stp off - bridge_waitport 0 - auto wg0 iface wg0 inet static address 172.17.255.1 diff --git a/vm/etc/postfix/main.cf b/vm/etc/postfix/main.cf index d96b8a0..bdf09c0 100644 --- a/vm/etc/postfix/main.cf +++ b/vm/etc/postfix/main.cf @@ -1,6 +1,6 @@ append_dot_mydomain = no biff = no compatibility_level = 2 -mynetworks = 127.0.0.0/8 172.17.0.0/16 [::1]/128 +mynetworks = 127.0.0.0/8 10.88.0.0/16 [::1]/128 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache smtp_use_tls = yes