misc new stuff

diff --git a/fai/config/files/etc/apt/preferences.d/nabia-jammy/NABIA b/fai/config/files/etc/apt/preferences.d/nabia-jammy/NABIA
new file mode 100644 (file)
index 0000000..7985fe5
--- /dev/null
+++ b/fai/config/files/etc/apt/preferences.d/nabia-jammy/NABIA
@@ -0,0 +1,3 @@
+Package: *
+Pin: release n=jammy,o=Ubuntu
+Pin-Priority: -100

diff --git a/fai/config/files/etc/apt/sources.list.d/jammy.list/JAMMY b/fai/config/files/etc/apt/sources.list.d/jammy.list/JAMMY
new file mode 100644 (file)
index 0000000..efaf991
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/jammy.list/JAMMY
@@ -0,0 +1,14 @@
+# multiverse needed for libfdk-aac1, which is actually free
+# https://www.gnu.org/licenses/license-list.html#fdk
+
+###### Ubuntu Main Repos
+deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse
+
+###### Ubuntu Update Repos
+deb http://archive.ubuntu.com/ubuntu/ jammy-security main universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ jammy-backports main universe
+deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main universe

diff --git a/fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA b/fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA
new file mode 120000 (symlink)
index 0000000..4892ca6
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA
@@ -0,0 +1 @@
+JAMMY
\ No newline at end of file

diff --git a/fai/config/package_config/UBUNTU.asc b/fai/config/package_config/UBUNTU.asc
index 932dea043fdd94fd5a822fac6b4685d228d23056..60756399ecb286c1b44d9c089fd15a0fa73acd5a 100644 (file)
--- a/fai/config/package_config/UBUNTU.asc
+++ b/fai/config/package_config/UBUNTU.asc
@@ -595,3 +595,32 @@ OUjl1uHdp8lsDZQjkYx+zpQ/bFUL73xyxn0eelk5Uj32dpv5qDDwxrlUuX3IKDua
 4kUSYA4gGsYHDz2icHaIeYR8Z7HHg0bFEnlLTq5qmkp2qyk=
 =yMYl
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq
+dXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ
+HZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq
+X7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k
+KHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns
+AQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta
+LygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq
+VlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd
+yHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv
+Y0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow
+DZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB
+tEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm
+dHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI
+AgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH
+beOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG
+g3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa
+Zl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy
+q+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF
+kuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0
+LZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr
+BumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5
+KFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA
+QEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp
+SpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+
+uOgcXny1UlwtCUzlrSaP
+=9AdM
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index deab6797c5e5ca4c225d35f2438a426dc01083d8..954afd4a3c1fa7c1622e05eff2092d496930f56f 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -29,6 +29,11 @@ fcopy -riBM /boot
 fcopy -riBM /root
 fcopy -riBM /usr/local/bin
 
+# this gets done by fai, but just happens too often that
+# I add sources due to new distros, whatever.
+fcopy -riBM /etc/apt/preferences.d
+fcopy -riBM /etc/apt/sources.list.d
+
 
 src=$FAI/distro-install-common/shadow
 dst=/q/root/shadow
@@ -50,12 +55,8 @@ tmpfile1=$(mktemp)
 chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 ||:
 fcopy -riBM /etc/apt
 
-# vps that didnt start with fai need the key
-case $HOSTNAME in
-  je|bk|li)
-    apt-key add /a/bin/fai/fai/config/package_config/UBUNTU.asc
-    ;;
-esac
+# get ubuntu key, for running from fai wrapper.
+apt-key add $FAI/package_config/UBUNTU.asc
 
 tmpfile2=$(mktemp)
 chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile2

diff --git a/wrt-setup-local b/wrt-setup-local
index 50956786147d5daaeb9fdb0f1fbf2115901958c7..4b198d1b4a1a641a980b95a683deb60d4703977f 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -621,6 +621,19 @@ config rule
  option target           ACCEPT
  option dest_port        22
 
+config redirect
+ option name promkd
+ option src              wan
+ option src_dport        9091
+ option dest_port        9091
+ option dest_ip          $l.2
+ option dest             lan
+config rule
+ option src              wan
+ option target           ACCEPT
+ option dest_port        9091
+
+
 config redirect
  option name sshkd
  option src              wan