X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-redep;h=b035ef55a74283163b544f8d58b78f0b89c0121e;hb=a030c6b0d89340212d3c04023dcd1fe2a52d31d1;hp=de4fe303b2e3a238b241a466c2e5d32b4d39ad2c;hpb=1a5548031efc4a1fa88ca94237eac3033cf97ef1;p=automated-distro-installer

diff --git a/fai-redep b/fai-redep
index de4fe30..b035ef5 100755
--- a/fai-redep
+++ b/fai-redep
@@ -30,20 +30,45 @@ 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
 
+shopt -s extglob
+ssh root@$faiserver_host rm -rf /srv/fai/config/!(basefiles)
+scp -qr fai/config root@$faiserver_host:/srv/fai
 
-ssh root@$faiserver_host rm -rf /srv/fai/config
-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
+scp -q ~/.ssh/id_rsa.pub \
+    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 \
+s scp -qr /q/root/luks /q/root/shadow \
   root@$faiserver_host:/srv/fai/config/distro-install-common
-scp /a/bin/devbyid root@$faiserver_host:/srv/fai/nfsroot/usr/local/bin
+
+# should tar ssh all the files, but these ones really justified it
+tar -cz /p/c/machine_specific/*/filesystem/etc/ssh | \
+  ssh root@$faiserver_host tar -xz -C /srv/fai/config/distro-install-common
+scp -q /a/bin/fai/devbyid root@$faiserver_host:/srv/fai/nfsroot/usr/local/bin
+
+
+# built BELANOS basefile 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 -q /a/bin/fai-basefiles/*.tar.xz root@$faiserver_host:/srv/fai/config/basefiles
 ssh root@$faiserver_host bash <<'EOF'
 set -eE -o pipefail
-chmod 644 /srv/fai/config/files/home/ian/.ssh/authorized_keys/GRUB_PC
+set -x
+# 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
+# this basefile has tar acls bug, so I'm using my own
+# local one for now.
+#cd /srv/fai/config/basefiles
+#u=http://fai-project.org/download/basefiles/XENIAL64.tar.xz
+#wget -nv -N $u
 EOF
+
+faiserver-enable