X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai-redep;h=3e1263d39551582d085adb46560588389ec20b68;hp=05414973ff69f9607fb7fec8f75897540cc5c2e4;hb=HEAD;hpb=fe81034ee9664d8e131bac218b40d99a58a31649 diff --git a/fai-redep b/fai-redep index 0541497..b90b30a 100755 --- a/fai-redep +++ b/fai-redep @@ -4,13 +4,21 @@ set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR +[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" + readonly this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"; cd "${this_file%/*}" +source bash-trace + usage() { cat <> /srv/fai/config/class/LAST.var +note FAI_ACTION might be able to be set elsewhere, like in grub for this case -d DISTRO DISTRO for setting up fai class DESKTOP packages, for preinstalling stuff. -t TARGET_HOST Copy only secrets for TARGET_HOST into the config space. Useful for virtual server @@ -46,97 +54,69 @@ readonly host distro target ##### end command line parsing ######## +m() { printf "$pre %s\n" "$*"; "$@"; } + # i use faiserver as a dns alias, but ssh key is associated with # a canonical hostname and we will have ssh warning spam unless we # use it, so look it up just to avoid the warning spam. -faiserver_host=$(chost $host) || faiserver_host=$host +faiserver_host=$(/a/exe/chost $host) +# faiserver_host=$host + +faiserver_addr=$(host $host | sed -rn 's/^\S+ has address //p;T;q' ||:) +if ! ip a | grep "^ *inet.\? $faiserver_addr" &>/dev/null; then + rpre=(-e "ssh -F $HOME/.ssh/confighome" root@$faiserver_host:) + faiserver_shell="ssh -F $HOME/.ssh/confighome root@$faiserver_host" +fi -rsync -rlpt --delete --relative --exclude /fai/config/basefiles/ fai/config root@$faiserver_host:/srv +# these are gitignored. +rsync -atL /home/iank/.ssh/authorized_keys fai/config/files/root/.ssh/authorized_keys/STANDARD +# we hssh and ssh_filter_btrbk for the initial btrbk (alternatively, I could open up the +# permissions in authorized_keys, but that just seems lazy) +install --owner=iank --group=iank -d fai/config/files/usr/local/bin/hssh +install --owner=iank --group=iank -d fai/config/files/usr/local/bin/ssh_filter_btrbk.sh +rsync -atL /a/opt/btrbk/ssh_filter_btrbk.sh fai/config/files/usr/local/bin/ssh_filter_btrbk.sh/STANDARD +m rsync -rlpt --delete --relative --exclude /fai/config/basefiles/ fai/config "${rpre[@]}"/srv -sudo rsync -a /root/.ssh/home.pub \ - root@$faiserver_host:/srv/fai/config/files/root/.ssh/authorized_keys/STANDARD # todo: automatically disable faiserver after a period so # these files are not available. + if [[ $target ]]; then - if sudo test -e /q/root/shadow/$target; then - shadowfile=shadow/$target # empty otherwise + secret_files=(luks/$target luks/host-$target shadow/$target) + exists=false + secret_exists=() + for f in ${secret_files[@]}; do + if [[ -e /q/root/$f ]]; then + exists=true + secrets_to_send+=("$f") + fi + done + if $exists; then + { + for f in ${secrets_to_send[@]}; do + echo $f + done + } | rsync -lpt --files-from=- /q/root "${rpre[@]}"/srv/fai/config/distro-install-common fi - sudo rsync -lpt --files-from=- /q/root root@$faiserver_host:/srv/fai/config/distro-install-common </dev/null ||: # broken pipe - + $faiserver_shell dd of=/srv/fai/config/package_config/DESKTOP status=none ||: # broken pipe -rsync -rplt --include '/*.gz' --exclude '/**' --delete-excluded $BASEFILE_DIR/ root@$faiserver_host:/srv/fai/config/basefiles/ -ssh root@$faiserver_host bash <<'EOF' -set -eE -o pipefail -# make it the root because pxe-kexec only looks there. -# It wouldn't be too hard to change if we needed. -# We could also just dump things in /srv/tftp, but fai -# has some defaults, which I don't even use, which expect -# the other directory, so it's kind of a tossup, whatever. -sed -ri 's,^ *(TFTP_DIRECTORY=).*,\1"/srv/tftp/fai",' /etc/default/tftpd-hpa -systemctl restart tftpd-hpa - -changed=false -f=/srv/fai/nfsroot/root/.ssh/known_hosts -install -d -m 700 /srv/fai/nfsroot/root/.ssh -# the known hosts entries that fai already sets up are like -# IP,HOSTNAME key_info... -# we are skipping the ip, because it doesn't block ssh -# with a prompt as long as you have the user supplied hostname, -# and i don't want to deal with getting it, it's not adding -# any important security in this case. -if ! grep -xFq "$line" $f &>/dev/null; then - changed=true - printf "%s\n" "$line" >>$f -fi -if ! modprobe nfsd &>/dev/null; then - # no apt-cache on maru debian, because we are low on space already - sed -i '/^ *APTPROXY=/d' /srv/fai/config/class/DEBIAN.var - # maru debian doesn't have loopback devs created - if ! losetup -f; then - shopt -s nullglob - x=(/dev/loop*) - minor=0 - if (( ${#x[@]} )); then - minor=$(( ${x[-1]#/dev/loop} + 1 )) - fi - mknod -m660 /dev/loop$minor b 7 $minor - losetup -f - fi - # -B boo only iso, no nfsroot, no paritial miorr, no config space. - # -f = force, for overwriting - # -S = make squash image for http booting - # -d config space url, instead of putting it in the squash.img, - # this just makes it so that we don't have to regenerate the img - # when the config changes. - cd /srv/fai/config - tar czf /var/www/faiserver/html/config.tar.gz . - if $changed || [[ ! -e /var/www/faiserver/html/squash.img ]]; then - # note, on maru, selinux needs to be disabled in android before - # this will work. - mount - export debug=true - fai-cd -d http://faiserver:8080/config.tar.gz -f -M -S /var/www/faiserver/html/squash.img - mount - fi -fi -EOF +m rsync -rplt --include '/*.zst' --exclude '/**' --delete-excluded $BASEFILE_DIR/ "${rpre[@]}"/srv/fai/config/basefiles/