From e5fc90391646ea35b06250a90ad3aa3c1c2516dc Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Thu, 3 Sep 2020 20:21:09 -0400
Subject: [PATCH] minor fixes and dns

---
 archlike-pxe       |  2 +-
 debian-pxe-preseed |  2 +-
 wrt-init           | 18 ++++++++++++++++++
 wrt-setup          | 20 ++------------------
 wrt-setup-local    | 28 ++++++++++++++++++++--------
 5 files changed, 42 insertions(+), 28 deletions(-)
 create mode 100755 wrt-init

diff --git a/archlike-pxe b/archlike-pxe
index 085679a..db05bf9 100755
--- a/archlike-pxe
+++ b/archlike-pxe
@@ -72,7 +72,7 @@ pushd $(dirname $sfs); md5sum ${sfs##*/} > airootfs.md5; popd
 
 # seems if you've done a pxe boot, mounted the nfs,
 # then shutdown, it's still busy.
-ssh wrt "/etc/init.d/nfsd stop; \
+ssh cmc "/etc/init.d/nfsd stop; \
 umount /run/archiso/bootmnt; \
 umount /run/parabolaiso/bootmnt; \
 rm -rf /mnt/usb/$idir"
diff --git a/debian-pxe-preseed b/debian-pxe-preseed
index 094294a..aaef9a6 100755
--- a/debian-pxe-preseed
+++ b/debian-pxe-preseed
@@ -29,7 +29,7 @@ e() { echo "$*"; "$@"; }
 mount_dir=$(mktemp -d)
 
 err-cleanup() { cd; umount -f $mount_dir; }
-e mount -o users wrt:/mnt/usb $mount_dir
+e mount -o users cmc:/mnt/usb $mount_dir
 
 
 cd $mount_dir
diff --git a/wrt-init b/wrt-init
new file mode 100755
index 0000000..ebfac9c
--- /dev/null
+++ b/wrt-init
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -x
+# librecmc 1.5.1 is missing nfs-kernel-server and screen
+source /etc/os-release
+if [ "$ID" == librecmc ] && [ "$VERSION" == v1.5.1-core ]; then
+  cat >/etc/opkg/customfeeds.conf <<'EOF'
+src/gz openwrt_packages http://downloads.openwrt.org/releases/19.07.3/packages/mips_24kc/packages
+fi
+EOF
+fi
+
+if ! opkg list-installed|grep bash; then
+  opkg update
+  opkg install bash
+fi
+export HOME_DOMAIN=$1
+shift
+wrt-setup-local "$@"
diff --git a/wrt-setup b/wrt-setup
index c86a0d5..7d3416b 100755
--- a/wrt-setup
+++ b/wrt-setup
@@ -69,27 +69,11 @@ fi
 echo "$0: host=$h"
 
 cat ~/.ssh/home.pub | ssh $h dd of=/etc/dropbear/authorized_keys 2>/dev/null
-scp /a/work/libremanage/libremanage /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin
+scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin
 # relay is built for openwrt 18.06.2, r7676-cddd7b4c77
 sudo scp /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \
      /a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \
      /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk} $h:
 scp ../openwrtkeyring/usign/* $h:/etc/opkg/keys
 
-ssh $h <<EOFOUTER
-set -x
-# librecmc 1.5.1 is missing nfs-kernel-server and screen
-source /etc/os-release
-if [[ $ID == librecmc && $VERSION == v1.5.1-core]]; then
- cat >/etc/opkg/customfeeds.conf <<'EOF'
-src/gz openwrt_packages http://downloads.openwrt.org/releases/19.07.3/packages/mips_24kc/packages
-fi
-EOF
-
-if ! opkg list-installed|grep bash; then
-    opkg update
-    opkg install bash
-fi
-export HOME_DOMAIN=$HOME_DOMAIN
-wrt-setup-local $@
-EOFOUTER
+ssh $h wrt-init $HOME_DOMAIN "$@"
diff --git a/wrt-setup-local b/wrt-setup-local
index 18b4b91..567a4a7 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -653,8 +653,9 @@ fi
 
 v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 127.0.1.1 $hostname
-$l.6 demohost
 #$l.7 x3
+$l.12 demohost
+$l.13 trp
 72.14.176.105 li
 2600:3c00::f03c:91ff:fe6d:baf8 li
 85.119.83.50 bk
@@ -670,12 +671,15 @@ case $hostname in
 $l.1 $hostname t.b8.nz
 $l.3 frodo
 $l.4 wrt2
+$l.5 x2 faiserver
+$l.6 x2w
 EOF
     v cedit host /etc/dnsmasq.conf <<EOF || dnsmasq_restart=true
 server=/b8.nz/#
 
 server=/kd.b8.nz/#
 server=/x2.b8.nz/#
+server=/x2w.b8.nz/#
 server=/tp.b8.nz/#
 server=/bb8.b8.nz/#
 server=/wrt3.b8.nz/#
@@ -686,14 +690,12 @@ EOF
     v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
 $l.1 $hostname b8.nz
 $l.2 kd
-$l.5 x2 faiserver
 $l.8 tp
 $l.9 bb8
 $l.14 wrt3
 EOF
     v cedit host /etc/dnsmasq.conf <<EOF || dnsmasq_restart=true
 server=/t.b8.nz/#
-
 server=/frodo.b8.nz/#
 server=/wrt.b8.nz/#
 server=/wrt2.b8.nz/#
@@ -711,9 +713,15 @@ esac
 uset dhcp.@dnsmasq[0].domain b8.nz
 uset dhcp.@dnsmasq[0].local /b8.nz/
 uset system.@system[0].hostname $hostname
-
-if [[ $(uci get adblock.global.adb_enabled) != 1 ]]; then
-  v uci set adblock.global.adb_enabled=1
+# uci doesnt seem to have a way to set an empty value,
+# if you delete it, it goes back to the default. this seems
+# to be a decent workaround.
+uset dhcp.@dnsmasq[0].resolvfile=/dev/null
+
+# disabled for now. i want to selectively enable it
+# for specific hosts.
+if [[ $(uci get adblock.global.adb_enabled) != 0 ]]; then
+  v uci set adblock.global.adb_enabled=0
   uci commit adblock
   /etc/init.d/adblock restart
 fi
@@ -781,17 +789,19 @@ dhcp-host=c8:60:00:31:6b:75,set:kd,$l.2,kd
 # top port, iPXE (PCI 04:00.0) in seabios boot menu
 #dhcp-host=c8:60:00:2b:15:07,set:kd,$l.2,kd
 dhcp-host=00:26:18:97:bb:16,set:frodo,$l.3,frodo
-# 4 is reserved for a staticly configured host.
+# 4 is reserved for a staticly configured host wrt2
 # old x2 with bad fan
 #dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2
 dhcp-host=f0:de:f1:81:ec:88,set:x2,$l.5,x2
+dhcp-host=c4:8e:8f:44:f5:63,set:x2w,$l.6,x2w
 # This is so fai can have an explicit name to use for testing,
 # or else any random machine which did a pxe boot would get
 # reformatted. The mac is from doing a virt-install, cancelling it,
 # and copying the generated mac, so it should be randomish.
-dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.6,demohost
 dhcp-host=00:1f:16:14:01:d8,set:tp,$l.7,x3
 dhcp-host=80:fa:5b:1c:6e:cf,set:tp,$l.8,tp
+dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.12,demohost
+dhcp-host=62:03:cb:a8:3e:a3,set:trp,$1.13,trp
 
 # faiserver vm
 dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
@@ -809,6 +819,8 @@ dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,$l.251,switch9429ca
 enable-tftp=br-lan
 tftp-root=/mnt/usb/tftpboot
 dhcp-optsfile=/etc/dnsmasq-dhcpopts.conf
+
+#log-queries=extra
 EOF
 
 
-- 
2.30.2