From 632c94b8382717f1a06b350c971b8246abbbbe61 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Sat, 7 Nov 2020 15:49:44 -0500
Subject: [PATCH] dns updates and apt sources

---
 fai/config/class/50-host-classes              | 25 +++++++++++++------
 .../etc/apt/sources.list.d/focal.list/ETIONA  | 14 ++++++-----
 fai/config/package_config/STANDARD            |  1 +
 wrt-setup-local                               |  6 +++--
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 6f2e407..6ab31da 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -98,17 +98,26 @@ fi
 
 if [[ -e /a/bin/fai/fai-wrapper ]]; then
   source /a/bin/distro-functions/src/identify-distros
-  if isdebian; then
-    echo "DEBIAN"
-    tmp=$(debian-codename)
-    echo ${tmp^^}
-    # nonfree repo is not going away any time soon due to
-    # gcc-doc being in nonfree
-    echo ${tmp^^}_NONFREE
+  if isdeb; then
+    codename=$(debian-codename)
+    echo ${codename^^}
+    distro=$(distro-name)
+    case $distro in
+      debian)
+        echo ${distro^^}
+        # nonfree repo is not going away any time soon due to
+        # gcc-doc being in nonfree
+        echo ${codename^^}_NONFREE
+        ;;
+      trisquel)
+        # easier to stay with fai example config if we just call it ubuntu
+        echo UBUNTU
+        ;;
+    esac
   fi
   case $HOSTNAME in
     li|lj) echo "LINODE" ;;
-    bk) echo "NOCRYPT" ;;
+    bk|je) echo "NOCRYPT" ;;
   esac
 fi
 
diff --git a/fai/config/files/etc/apt/sources.list.d/focal.list/ETIONA b/fai/config/files/etc/apt/sources.list.d/focal.list/ETIONA
index a4d6395..2f4fbcb 100644
--- a/fai/config/files/etc/apt/sources.list.d/focal.list/ETIONA
+++ b/fai/config/files/etc/apt/sources.list.d/focal.list/ETIONA
@@ -1,6 +1,8 @@
-deb http://us.archive.ubuntu.com/ubuntu/ focal main universe
-deb http://us.archive.ubuntu.com/ubuntu/ focal-updates main universe
-deb http://us.archive.ubuntu.com/ubuntu/ focal-security main universe
-deb-src http://us.archive.ubuntu.com/ubuntu/ focal main universe
-deb-src http://us.archive.ubuntu.com/ubuntu/ focal-updates main universe
-deb-src http://us.archive.ubuntu.com/ubuntu/ focal-security main universe
+deb http://archive.ubuntu.com/ubuntu/ focal main universe
+deb http://archive.ubuntu.com/ubuntu/ focal-updates main universe
+deb http://archive.ubuntu.com/ubuntu/ focal-security main universe
+deb http://archive.ubuntu.com/ubuntu/ focal-backports main universe
+deb-src http://archive.ubuntu.com/ubuntu/ focal main universe
+deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main universe
+deb-src http://archive.ubuntu.com/ubuntu/ focal-security main universe
+deb-src http://archive.ubuntu.com/ubuntu/ focal-backports main universe
diff --git a/fai/config/package_config/STANDARD b/fai/config/package_config/STANDARD
index 1870c2e..02f27b3 100644
--- a/fai/config/package_config/STANDARD
+++ b/fai/config/package_config/STANDARD
@@ -56,6 +56,7 @@ apt-transport-https
 # and fai scripts want to call ifquery.
 ifupdown
 netplan.io-
+libnss-resolve
 
 # iank, copied from DEBIAN so it goes into ubuntu too
 PACKAGES install GRUB_PC
diff --git a/wrt-setup-local b/wrt-setup-local
index 4b61c08..17fb9d2 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -679,7 +679,7 @@ case $hostname in
     v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
 $l.1 $hostname b8.nz
 $l.2 kd
-$l.3 frodo
+#$l.3 frodo
 $l.4 wrt2
 $l.5 x2 faiserver
 $l.6 x2w
@@ -689,7 +689,7 @@ $l.9 bb8
 $l.14 wrt3
 #$l.18 x3
 $l.19 brother
-$l.28 frodow
+#$l.28 frodow
 EOF
     ;;
 esac
@@ -707,6 +707,7 @@ uset system.@system[0].hostname $hostname
 # 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.
+# todo: setup /etc/resolv.conf to point to 127.0.0.1
 uset dhcp.@dnsmasq[0].resolvfile=/dev/null
 
 # disabled for now. i want to selectively enable it
@@ -735,6 +736,7 @@ server=/_dmarc.b8.nz/#
 server=/ns1.b8.nz/#
 server=/ns2.b8.nz/#
 server=/bk.b8.nz/#
+server=/je.b8.nz/#
 mx-host=b8.nz,mail.iankelling.org,10
 txt-record=b8.nz,"v=spf1 a ?all"
 
-- 
2.30.2