mostly changes related to moving home server

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 47f103ed17936d7443a9e951c5cfddba8326615d..ec2334424d29caf73250795e8f76a7be0042c3c2 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -366,22 +366,23 @@ EOF
     # /dev/mapper/crypt_dev_${big_disks[0]}  /mnt/i  btrfs  nofail,$fstabstd,noatime,subvolid=0  0 0
     # EOF
     #     fi
-    if [[ $HOSTNAME == kd ]]; then
-      # note, having these with keyscript and initramfs causes a luks error in fai.log,
-      # but it is safely ignorable and gets us the ability to just type our password
-      # in once at boot. A downside is that they are probably needed to be plugged in to boot.
-      cat >>/tmp/fai/crypttab <<EOF
+    # helpful for manually running later if these disks move hosts
+    target_etc=/etc
+    target_etc=/tmp/fai
+    if [[ $HOSTNAME == frodo ]]; then
+      cat >>$target_etc/crypttab <<EOF
 crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V${even_bigsuf} /dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V${even_bigsuf}  /mnt/root/q/root/luks/iank  discard,luks
 crypt_dev_ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1 /dev/disk/by-id/ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1  /mnt/root/q/root/luks/iank  discard,luks
 crypt_dev_ata-ST6000DM001-1XY17Z_Z4D29EBL-part1 /dev/disk/by-id/ata-ST6000DM001-1XY17Z_Z4D29EBL-part1  /mnt/root/q/root/luks/iank  discard,luks
 EOF
-      cat >> /tmp/fai/fstab <<EOF
+      cat >> $target_etc/fstab <<EOF
 # r7 = root partition7. it isnt actually #7 anymore, not a great name, but whatever
 /dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V${even_bigsuf}  /mnt/r7  btrfs  nofail,$fstabstd,noatime,compress=zstd,subvolid=0  0 0
 /dev/mapper/crypt_dev_ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1  /mnt/rust1  btrfs  nofail,$fstabstd,noatime,compress=zstd,subvolid=0  0 0
 /dev/mapper/crypt_dev_ata-ST6000DM001-1XY17Z_Z4D29EBL-part1  /mnt/rust2  btrfs  nofail,$fstabstd,noatime,compress=zstd,subvolid=0  0 0
 EOF
     fi
+      fi
   fi
 }
 

diff --git a/wrt-setup b/wrt-setup
index 8f94f715c406d73f0b20f14461a217cc36048d87..175d24c7d06e4112d92a71c7b5aafadc8d417552 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -80,7 +80,8 @@ rsync /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-l
 
 rsync /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \
       /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk}  \
-      /p/c/{ptr,dnsmasq,cmc-firewall}-data /p/c/cmc-firewall-data-http /b/bash-bear-trap/bash-bear $h:
+      /p/c/domain-info /p/c/host-info \
+      /p/c/{ptr,dnsmasq,cmc-firewall}-data  /b/bash-bear-trap/bash-bear $h:
 rsync ../openwrtkeyring/usign/* $h:/etc/opkg/keys
 
 ssh $h wrt-init ${HOME_DOMAIN:-b8.nz} "$@"

diff --git a/wrt-setup-local b/wrt-setup-local
index a7ddc077cc7090fb9bb98263f20324de9ce8aa5b..d4a20e8b37c202468c005f5e526aa351b382e8f0 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -217,6 +217,9 @@ cedit() {
   v command cedit -v "$@"
 }
 
+# shellcheck source=/p/c/domain-info
+. /root/domain-info
+d_host_suffix=$(awk '$2 == "'$d_host'" {print $1}' /root/host-info)
 
 ### network config
 ###
@@ -556,7 +559,7 @@ config 'route' 'transmission'
  option 'interface' 'lan'
  option 'target' '10.174.0.0'
  option 'netmask' '255.255.0.0'
- option 'gateway' '$l.2'
+ option 'gateway' '$l.$d_host_suffix'
 
 option interface 'wg0'
  option proto 'wireguard'
@@ -565,7 +568,7 @@ option interface 'wg0'
  list addresses '10.3.0.1/24'
  list addresses 'fdfd::1/64'
 
-# tp
+# tp # tp is decomissioned, but this is an example of a client.
 config wireguard_wg0 'wgclient'
  option public_key '3q+WJGrm85r59NgeXOIvppxoW4ux/+koSw6Fee1c1TI='
  option preshared_key '$(cat /root/wg.psk)'
@@ -611,7 +614,7 @@ config redirect
  option name ssh
  option src              wan
  option src_dport        22
- option dest_ip          $l.2
+ option dest_ip          $l.$d_host_suffix
  option dest             lan
 EOF
     ;;
@@ -620,9 +623,6 @@ esac
 {
   # shellcheck source=/p/c/cmc-firewall-data
   . /root/cmc-firewall-data
-  # sets $http_ip
-  # shellcheck source=/p/c/cmc-firewall-data-http
-  . /root/cmc-firewall-data-http
   cat <<EOF
 config redirect
  option name http
@@ -725,7 +725,7 @@ config redirect
  option src              wan
  option src_dport        9091
  option dest_port        9091
- option dest_ip          $l.2
+ option dest_ip          $l.$d_host_suffix
  option dest             lan
 config rule
  option src              wan
@@ -740,7 +740,7 @@ config rule
 #  option src              wan
 #  option src_dport        1196
 #  option dest_port        1196
-#  option dest_ip          $l.2
+#  option dest_ip          $l.$d_host_suffix
 #  option dest             lan
 # config rule
 #  option src              wan
@@ -753,7 +753,7 @@ config redirect
  option src              wan
  option src_dport        8989
  option dest_port        8989
- option dest_ip          $l.2
+ option dest_ip          $l.$d_host_suffix
  option dest             lan
 config rule
  option src              wan
@@ -767,7 +767,7 @@ config redirect
  option src              wan
  option src_dport        8000
  option dest_port        8000
- option dest_ip          $l.2
+ option dest_ip          $l.$d_host_suffix
  option dest             lan
 config rule
  option src              wan
@@ -792,7 +792,7 @@ config redirect
  option src              wan
  option src_dport        4500
  option dest_port        4500
- option dest_ip          $l.2
+ option dest_ip          $l.$d_host_suffix
  option dest             lan
 config rule
  option src              wan
@@ -804,7 +804,7 @@ config redirect
  option src              wan
  option src_dport        4533
  option dest_port        4533
- option dest_ip          $l.2
+ option dest_ip          $l.$d_host_suffix
  option dest             lan
 config rule
  option src              wan
@@ -818,7 +818,7 @@ config rule
 # option src              lan
 # option src_dport        4533
 # option dest_port        4533
-# option dest_ip          $l.2
+# option dest_ip          $l.$d_host_suffix
 # option dest             lan
 
 
@@ -827,7 +827,7 @@ config rule
 #  option src              wan
 #  option src_dport        8000
 #  option dest_port        8000
-#  option dest_ip          $l.2
+#  option dest_ip          $l.$d_host_suffix
 #  option dest             lan
 # config rule
 #  option src              wan
@@ -840,7 +840,7 @@ config rule
 #  option src              wan
 #  option src_dport        8448
 #  option dest             lan
-#  option dest_ip          $l.2
+#  option dest_ip          $l.$d_host_suffix
 #  option proto            tcp
 # config rule
 #  option src              wan
@@ -1061,7 +1061,7 @@ EOF
 
 local-data-ptr: "10.2.0.1 cmc.b8.nz"
 
-local-data-ptr: "10.174.2.2 transmission.b8.nz"
+local-data-ptr: "10.174.2.$d_host_suffix transmission.b8.nz"
 local-data-ptr: "10.173.8.1 defaultnn.b8.nz"
 local-data-ptr: "10.173.8.2 nn.b8.nz"