X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-redep;h=2f59ef7ff728f11be9f12a9b2afdcfab2c7f257b;hb=ec9227898fa68bd89de454c87bce8ea051a8d783;hp=1f0d92f2ad2584522d0461567a7d2bceedcb5cbf;hpb=d0b6a8cd4608fdffcf733f9180744819d8889be0;p=automated-distro-installer

diff --git a/fai-redep b/fai-redep
index 1f0d92f..2f59ef7 100755
--- a/fai-redep
+++ b/fai-redep
@@ -30,13 +30,13 @@ cd $(dirname $(readlink -f "$BASH_SOURCE"))
 # use it, so look it up just to avoid the warning spam.
 faiserver_host=$(chost faiserver) || faiserver_host=faiserver
 
-
-ssh root@$faiserver_host rm -rf /srv/fai/config
+shopt -s extglob
+ssh root@$faiserver_host rm -rf /srv/fai/config/!(basefiles)
 scp -r fai/config root@$faiserver_host:/srv/fai
 
 
 scp ~/.ssh/id_rsa.pub \
-    root@$faiserver_host:/srv/fai/config/files/home/ian/.ssh/authorized_keys/GRUB_PC
+    root@$faiserver_host:/srv/fai/config/files/root/.ssh/authorized_keys/GRUB_PC
 # todo: automatically disable faiserver after a period so
 # these files are not exposed.
 s scp -r /q/root/luks /q/root/shadow \
@@ -45,11 +45,18 @@ scp /a/bin/devbyid root@$faiserver_host:/srv/fai/nfsroot/usr/local/bin
 # built this with mk-basefile -J BELENOS64. it's stored in it's own repo which
 # is published alongside this one called fai-basefiles due
 # to being a large binary file.
-scp /a/bin/basefiles/BELENOS64.tar.xz root@$faiserver_host:/srv/fai/config/basefiles
+scp /a/bin/fai-basefiles/BELENOS64.tar.xz root@$faiserver_host:/srv/fai/config/basefiles
 ssh root@$faiserver_host bash <<'EOF'
 set -eE -o pipefail
 set -x
-chmod 644 /srv/fai/config/files/home/ian/.ssh/authorized_keys/GRUB_PC
+# 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
+chmod 644 /srv/fai/config/files/root/.ssh/authorized_keys/GRUB_PC
 chmod -R a+rX /srv/fai/config/distro-install-common
 cd /srv/fai/config/basefiles
 u=http://fai-project.org/download/basefiles/XENIAL64.tar.xz