diff --git a/_vm.sh b/_vm.sh index 9ac94f0..1a99144 100755 --- a/_vm.sh +++ b/_vm.sh @@ -86,7 +86,7 @@ chroot /mnt setup-timezone -z Europe/Prague # Install basic system apk --no-cache add apache2-utils gettext wget https://dl.dasm.cz/_vm.tar -O - | tar xf - -C /mnt -chroot /mnt apk --no-cache add ca-certificates curl bridge e2fsprogs-extra gettext iptables kbd-misc libressl lxc postfix nginx util-linux acme-sh@vm vmmgr@vm +chroot /mnt apk --no-cache add ca-certificates curl bridge e2fsprogs-extra gettext iptables kbd-misc libressl lxc postfix nginx util-linux wireguard-virt@et wireguard-tools-wg@et acme-sh@vm vmmgr@vm chroot /mnt newaliases mkdir /mnt/var/log/lxc for SERVICE in cgroups consolefont crond iptables networking nginx ntpd postfix swap urandom vmmgr; do diff --git a/_vm/etc/apk/repositories b/_vm/etc/apk/repositories index ac06fce..32690e2 100644 --- a/_vm/etc/apk/repositories +++ b/_vm/etc/apk/repositories @@ -1,3 +1,4 @@ http://dl-cdn.alpinelinux.org/alpine/v3.9/main http://dl-cdn.alpinelinux.org/alpine/v3.9/community +@et http://dl-cdn.alpinelinux.org/alpine/edge/testing @vm https://dl.dasm.cz/spotter-abuild diff --git a/_vm/etc/network/interfaces b/_vm/etc/network/interfaces index 5ffc97b..646b496 100644 --- a/_vm/etc/network/interfaces +++ b/_vm/etc/network/interfaces @@ -7,9 +7,15 @@ iface eth0 inet dhcp auto lxcbr0 iface lxcbr0 inet static address 172.17.0.1 - network 172.17.0.0 netmask 255.255.0.0 - broadcast 172.17.255.255 bridge_fd 0 bridge_stp off bridge_waitport 0 + +auto wg0 +iface wg0 inet static + address 172.18.0.2 + netmask 255.255.255.252 + pre-up ip link add $IFACE type wireguard + pre-up wg setconf $IFACE /etc/wireguard/wg0.conf + post-down ip link del $IFACE diff --git a/vmmgr b/vmmgr index 8889900..d863fe6 160000 --- a/vmmgr +++ b/vmmgr @@ -1 +1 @@ -Subproject commit 8889900650991ea75dbe5e194fe2a683fe398b4b +Subproject commit d863fe6675db3da57a81600d3b53bade7712e192