Compress vm.tar and update vmmgr config.json adminpwd init

This commit is contained in:
Disassembler 2020-03-13 00:19:00 +01:00
parent 7a19274211
commit f16d2cde9b
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
2 changed files with 4 additions and 3 deletions

View File

@ -9,7 +9,7 @@ make html
# Build basic tar # Build basic tar
cd ${ROOT}/vm cd ${ROOT}/vm
tar cpf /srv/build/vm.tar * tar czpf /srv/build/vm.tar.gz *
# Build native apps # Build native apps
cd ${ROOT}/apk/geos cd ${ROOT}/apk/geos

5
vm.sh
View File

@ -86,14 +86,15 @@ chroot /mnt setup-timezone -z Europe/Prague
# Install basic system # Install basic system
apk --no-cache add apache2-utils gettext apk --no-cache add apache2-utils gettext
wget https://repo.spotter.cz/vm.tar -O - | tar xf - -C /mnt wget https://repo.spotter.cz/vm.tar.gz -O - | tar xzf - -C /mnt
envsubst </mnt/boot/extlinux.conf.old >/mnt/boot/extlinux.conf envsubst </mnt/boot/extlinux.conf.old >/mnt/boot/extlinux.conf
chroot /mnt apk --no-cache add bridge ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc logrotate postfix nginx openssh-server openssh-sftp-server util-linux wireguard-virt wireguard-tools-wg spoc@vm vmmgr@vm chroot /mnt apk --no-cache add bridge ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc logrotate postfix nginx openssh-server openssh-sftp-server util-linux wireguard-virt wireguard-tools-wg spoc@vm vmmgr@vm
chroot /mnt newaliases chroot /mnt newaliases
for SERVICE in consolefont crond iptables networking nginx ntpd postfix spoc swap urandom vmmgr; do for SERVICE in consolefont crond iptables networking nginx ntpd postfix spoc swap urandom vmmgr; do
ln -s /etc/init.d/${SERVICE} /mnt/etc/runlevels/boot ln -s /etc/init.d/${SERVICE} /mnt/etc/runlevels/boot
done done
ADMINPWD=$(htpasswd -bnBC 10 '' "${ENCPWD}" | tr -d ':\n' | sed 's/$2y/$2b/') envsubst </mnt/etc/vmmgr/config.default.json >/mnt/etc/vmmgr/config.json ADMINPWD=$(htpasswd -bnBC 10 '' "${ENCPWD}" | tr -d ':\n' | sed 's/$2y/$2b/') envsubst </mnt/etc/vmmgr/config.json >/mnt/etc/vmmgr/config.json.new
mv /mnt/etc/vmmgr/config.json.new /mnt/etc/vmmgr/config.json
# Cleanup # Cleanup
rm -rf /mnt/root rm -rf /mnt/root