fic/server
1
0
Fork 0
Code Issues Pull Requests 4 Releases Wiki Activity

fickit: Fix PXE + prepare

Browse Source
This commit is contained in:
nemunaire 2023-10-23 18:27:00 +02:00
parent ec61b7ed1d
commit 0c7f5b88df
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile-deploy
View File

@ -7,7 +7,7 @@ EXPOSE 80/tcp
ENTRYPOINT ["/usr/sbin/initial-config.sh"] ENTRYPOINT ["/usr/sbin/initial-config.sh"]
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
WORKDIR /srv WORKDIR /srv/s
RUN apk add --no-cache \ RUN apk add --no-cache \
busybox-extras \ busybox-extras \
@ -16,9 +16,9 @@ RUN apk add --no-cache \
tftp-hpa tftp-hpa
RUN touch /var/lib/udhcpd/udhcpd.leases && \ RUN touch /var/lib/udhcpd/udhcpd.leases && \
ln -s /srv /usr/share/syslinux/s mv /usr/share/syslinux/* /srv
COPY configs/deploy-initial-config.sh /usr/sbin/initial-config.sh COPY configs/deploy-initial-config.sh /usr/sbin/initial-config.sh
COPY configs/deploy-supervisord.conf /etc/supervisord.conf COPY configs/deploy-supervisord.conf /etc/supervisord.conf
COPY configs/udhcpd-sample.conf /etc/udhcpd.conf COPY configs/udhcpd-sample.conf /etc/udhcpd.conf
COPY configs/pxelinux.cfg /usr/share/syslinux/pxelinux.cfg/default COPY configs/pxelinux.cfg /srv/pxelinux.cfg/default

4
configs/deploy-supervisord.conf
View File

@ -3,14 +3,14 @@ nodaemon = true
silent = true silent = true
[program:httpd] [program:httpd]
command = /usr/sbin/httpd -f -vv -h /srv command = /usr/sbin/httpd -f -vv -h /srv/s
stdout_logfile = /dev/stdout stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0 stdout_logfile_maxbytes = 0
stderr_logfile = /dev/stderr stderr_logfile = /dev/stderr
stderr_logfile_maxbytes = 0 stderr_logfile_maxbytes = 0
[program:tftpd] [program:tftpd]
command = /usr/sbin/in.tftpd -a 0.0.0.0:69 -v -s /usr/share/syslinux/ command = /usr/sbin/in.tftpd -a 0.0.0.0:69 -v -s /srv
stdout_logfile = /dev/stdout stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0 stdout_logfile_maxbytes = 0
stderr_logfile = /dev/stderr stderr_logfile = /dev/stderr

8
configs/gen_metadata.sh
View File

@ -22,10 +22,10 @@ then
FNAME="user-data" FNAME="user-data"
fi fi
export DM_CRYPT=$(jq -r '."dm-crypt".entries.key.content' "${FNAME}") export DM_CRYPT=$(jq -r '."dm-crypt".entries.key.content' "${FNAME}" | escape_newline)
export DHPARAM=$(jq -r '."tls_config".entries."dhparams-4096.pem".content' "${FNAME}") export DHPARAM=$(jq -r '."tls_config".entries."dhparams-4096.pem".content' "${FNAME}" | escape_newline)
export SYNCRO_PRIVATE_KEY=$(jq -r '.synchro.entries.id_ed25519.content' "${FNAME}") export SYNCRO_PRIVATE_KEY=$(jq -r '.synchro.entries.id_ed25519.content' "${FNAME}" | escape_newline)
export SYNCRO_PUBLIC_KEY=$(jq -r '.synchro.entries."id_ed25519.pub".content' "${FNAME}") export SYNCRO_PUBLIC_KEY=$(jq -r '.synchro.entries."id_ed25519.pub".content' "${FNAME}" | escape_newline)
fi fi
which vault > /dev/null 2> /dev/null || { echo "Please install vault" >&2; exit 1; } which vault > /dev/null 2> /dev/null || { echo "Please install vault" >&2; exit 1; }

4
configs/pxelinux.cfg
View File

@ -17,12 +17,12 @@ LABEL backend
LABEL frontend LABEL frontend
MENU LABEL Prepare for ^frontend MENU LABEL Prepare for ^frontend
LINUX /s/fickit-boot-kernel LINUX /s/fickit-boot-kernel
INITRD /s/fickit-boot-initrd.img INITRD /s/fickit-prepare-initrd.img
APPEND console=tty0 fickit.autoprepare=frontend APPEND console=tty0 fickit.autoprepare=frontend
LABEL prepare LABEL prepare
MENU LABEL Prepare with ^shell MENU LABEL Prepare with ^shell
LINUX /s/fickit-boot-kernel LINUX /s/fickit-boot-kernel
INITRD /s/fickit-boot-initrd.img INITRD /s/fickit-prepare-initrd.img
APPEND console=tty0 APPEND console=tty0
LABEL update LABEL update
MENU LABEL ^Update images MENU LABEL ^Update images

2
configs/update_imgs.sh
View File

@ -27,4 +27,6 @@ OLD_KEY=$(cat /run/config/dm-crypt/key)
done done
} }
umount "${ISO}"
dd if=/boot/imgs/fickit-metadata.iso of="$2" dd if=/boot/imgs/fickit-metadata.iso of="$2"