new host stuff

diff --git a/distro-end b/distro-end
index 73d7a0a89345c7c4b34bd99d7f53295924c58b3e..78162c99c0e8520731b5aee7e74b9f89d98e83a4 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -451,6 +451,29 @@ esac
 rm -fv /etc/apt/preferences.d/radicale
 ######### end universal pinned packages ######
 
+### system76 things ###
+case $HOSTNAME in
+  sy)
+    # note, i stored the initial popos packages at /a/bin/data/popos-pkgs
+    if [[ ! -d /etc/apt/sources.list.d/system76.list ]]; then
+      # https://blog.zackad.dev/en/2017/08/17/add-ppa-simple-way.html
+      sd /etc/apt/sources.list.d/system76.list <<EOF
+deb http://ppa.launchpad.net/system76-dev/stable/ubuntu $codename_compat main
+deb-src http://ppa.launchpad.net/system76-dev/stable/ubuntu $codename_compat main
+EOF
+      s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5D1F3A80254F6AFBA254FED5ACD442D1C8B7748B
+      p update
+      sd /etc/apt/preferences.d/system76 <<'EOF'
+Package: *
+Pin: release o=LP-PPA-system76-dev-stable
+Pin-Priority: 1001
+EOF
+      pi system76-driver
+    fi
+    ;;
+esac
+
+
 ##### begin automatic upgrades (after checkrestart has been installed) ####
 # if apt-config-auto-update is installed,
 # it also has similar config, in a file 10something,
@@ -532,6 +555,9 @@ case $HOSTNAME in
 
     # general vpn for as needed use
     vpn-server-setup -d -r -4 10.5.5 -p 443 -n hole
+    sd /etc/openvpn/client-config-hole/sy <<'EOF'
+ifconfig-push 10.5.5.12 255.255.255.0
+EOF
     sd /etc/openvpn/client-config-hole/kw <<'EOF'
 ifconfig-push 10.5.5.9 255.255.255.0
 EOF
@@ -947,7 +973,7 @@ if [[ -e /p/c/gen-fsf-vpn ]]; then
   /p/c/gen-fsf-vpn
 fi
 
-if [[ -e /p/c/machine_specific/$HOSTNAME/etc/openvpn/client/hole.crt ]]; then
+if [[ -e /p/c/machine_specific/$HOSTNAME/filesystem/etc/openvpn/client/hole.crt ]]; then
   sgo openvpn-client@hole
 fi
 

diff --git a/pkgs b/pkgs
index e644f6ef56b77e3d038372d169c12d65f28ef816..e7b29f91cc40f580ea13ed6e8eb53571b4b17e56 100644 (file)
--- a/pkgs
+++ b/pkgs
@@ -58,6 +58,7 @@ p3=(
   ansible
   apache2
   apache2-doc
+  apg
   apt-doc
   apt-listchanges
   apt-rdepends