From dd9b3506bc63b26a5e58590dd615688809c6c14d Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Sun, 11 Oct 2020 09:21:09 -0400
Subject: [PATCH] misc config changes

---
 README                             | 13 ++++++++
 fai/config/scripts/GRUB_PC/11-iank |  6 +++-
 wrt-setup-local                    | 53 ++++++++++++++----------------
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/README b/README
index 12d3b06..5f78075 100644
--- a/README
+++ b/README
@@ -268,6 +268,19 @@ umount dev
 umount sys
 reboot
 
+# pine rock64 notes
+# the only useful image is ubuntu 18.04 ayafun or something.
+# using emmc usb:
+s mount /dev/sdb7 /mnt/1
+s cp `which qemu-arm-static` /mnt/1/usr/bin
+s chroot /mnt/1 qemu-arm-static /bin/bash
+usermod --login iank --move-home --home /home/iank rock46
+groupmod --new-name iank rock64
+passwd iank
+# boot it
+s apt-get update
+s apt dist-upgrade
+
 
 # TODO
 Change arch to archlike and to support arch and parabola
diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index 19be284..863c991 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -125,7 +125,7 @@ f=/etc/ssh/sshd_config
 grep -xFq "$line" $f || tee -a $f <<<"$line"
 
 
-# default debian groups (jessie through buster) + adm, sudo
+# default debian groups (jessie through buster) + adm, sudo, root
 for g in cdrom floppy audio dip video plugdev netdev adm sudo; do
   if getent gropu $g >/dev/null; then
     usermod -aG $g iank
@@ -160,6 +160,10 @@ if [[ $FAI_ACTION != dirinstall ]] && ! ifclass NOCRYPT; then
   else
     speed=115200
     cmdline="rd.luks.crypttab=no net.ifnames=0 console=ttyS0,${speed}n8 console=tty0"
+    case $HOSTNAME in
+      # per rubens suggestion to make a d16 more stable
+      kd|kw) cmdline+=" pci=realloc=off" ;;
+    esac
   fi
 
   cat >$FAI_ROOT/etc/grub.d/40_custom <<EOF
diff --git a/wrt-setup-local b/wrt-setup-local
index 567a4a7..4b61c08 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -526,6 +526,17 @@ config rule
  option target           ACCEPT
  option dest_port        2208
 
+config redirect
+ option name icecast
+ option src              wan
+ option src_dport        8000
+ option dest_port        8000
+ option dest_ip          $l.2
+ option dest             lan
+config rule
+ option src              wan
+ option target           ACCEPT
+ option dest_port        8000
 
 config rule
  option name sshwrt
@@ -658,47 +669,27 @@ $l.12 demohost
 $l.13 trp
 72.14.176.105 li
 2600:3c00::f03c:91ff:fe6d:baf8 li
-85.119.83.50 bk
-2001:ba8:1f1:f0c9::2 bk
 
 # netns creation looks for next free subnet starting at 10.173, but I only
 # use one, and I would keep this one as the first created.
 10.173.0.2 transmission
 EOF
 case $hostname in
-  wrt)
+  cmc)
     v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
-$l.1 $hostname t.b8.nz
+$l.1 $hostname b8.nz
+$l.2 kd
 $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/#
-EOF
-    ;;
-
-  cmc)
-    v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
-$l.1 $hostname b8.nz
-$l.2 kd
+$l.7 rp
 $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/#
+#$l.18 x3
+$l.19 brother
+$l.28 frodow
 EOF
     ;;
 esac
@@ -743,6 +734,7 @@ server=/_domainkey.b8.nz/#
 server=/_dmarc.b8.nz/#
 server=/ns1.b8.nz/#
 server=/ns2.b8.nz/#
+server=/bk.b8.nz/#
 mx-host=b8.nz,mail.iankelling.org,10
 txt-record=b8.nz,"v=spf1 a ?all"
 
@@ -798,10 +790,15 @@ dhcp-host=c4:8e:8f:44:f5:63,set:x2w,$l.6,x2w
 # 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=00:1f:16:14:01:d8,set:tp,$l.7,x3
+dhcp-host=fa:08:f8:4c:14:1c,set:tp,$l.7,rp
 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
+dhcp-host=00:1f:16:14:01:d8,set:tp,$l.18,x3
+# BRN001BA98CA823 in dhcp logs
+dhcp-host=00:1b:a9:8c:a8:23,set:tp,$l.19,brother
+dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow
+
 
 # faiserver vm
 dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
-- 
2.30.2