Mercurial > code > home > repos > infra

changeset 247:ff36727f3a10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pkg and host updates
author drewp@bigasterisk.com
date Thu, 28 Dec 2023 16:38:05 -0800
parents cb9dce5b0731
children 7566ede833cf
files apt.py files/fstab/dash inventory.py package_lists.py system.py templates/sources.list.j2 wireguard_pubkey.py
diffstat 7 files changed, 32 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/apt.py	Thu Dec 14 16:46:37 2023 -0800
+++ b/apt.py	Thu Dec 28 16:38:05 2023 -0800
@@ -12,7 +12,7 @@
     for url, name in [
         ('https://repo.steampowered.com/steam/archive/stable/steam.gpg', 'steam.gpg'),
     ]:
-        files.download(src=url, dest=f'/etc/apt/keyrings/{name}')
+        files.download(src=url, dest=f'/usr/share/keyrings/{name}')
 
     # vscode keeps making this, but I fetch my own
     files.file(path='/etc/apt/trusted.gpg.d/microsoft.gpg', present=False)
@@ -24,6 +24,7 @@
     server.shell(commands=[
         f"curl -fsSL {url} | gpg --dearmor > /etc/apt/keyrings/{name}" for (url, name) in [
             ('https://packages.microsoft.com/keys/microsoft.asc', 'ms.gpg'),
+            ('https://deb.nodesource.com/gpgkey/nodesource.gpg.key', 'nodesource-older.gpg'), # rm after everything's on 23.10
             ('https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key', 'nodesource.gpg'),
             ('https://dl.google.com/linux/linux_signing_key.pub', 'chrome.gpg'),
             ('https://ftp-master.debian.org/keys/archive-key-11.asc', 'bullseye.gpg'),
--- a/files/fstab/dash	Thu Dec 14 16:46:37 2023 -0800
+++ b/files/fstab/dash	Thu Dec 28 16:38:05 2023 -0800
@@ -4,10 +4,19 @@
 /dev/disk/by-uuid/d8d23ff1-7c37-4a7d-9fc4-55fc61f912a0 / ext4 defaults 0 1
 /dev/disk/by-uuid/CB55-821E /boot/efi vfat defaults 0 1
 
-#UUID=6cae1c30-3c91-4aa7-9e9f-fcbd7ff706fe /    ext4  errors=remount-ro 0       1
+
 #UUID=b88f75cd-9022-4af9-a11b-5a5a1fbd3132 /d2  ext4  defaults 0 0
 #UUID=3b6780e0-ec86-43be-8d09-e462dbad762e /d3  ext4  defaults 0 0
 #UUID=73bcd201-5f77-4f68-9fba-47835c3c1692 /d4  ext4  defaults 0 0
+
+
+
+UUID=73bcd201-5f77-4f68-9fba-47835c3c1692 /d2  ext4  defaults 0 0
+UUID=6cae1c30-3c91-4aa7-9e9f-fcbd7ff706fe /d3  ext4  defaults 0 0
+UUID=3b6780e0-ec86-43be-8d09-e462dbad762e /d4  ext4  defaults 0 0
+
+
+
 #/swap.img	none	swap	sw	0	0
 
 ditto5:/my                           /my       nfs  rw,noatime          0       0
--- a/inventory.py	Thu Dec 14 16:46:37 2023 -0800
+++ b/inventory.py	Thu Dec 28 16:38:05 2023 -0800
@@ -16,5 +16,5 @@
 
 remote = [
     ('prime',  { 'wireguard_address': '10.5.0.2',  'ssh_hostname': '162.243.138.136','mac': '04:01:09:7f:89:01',}),
-    ('plus',   { 'wireguard_address': '10.5.0.110','ssh_hostname': 'plus',                                      }),
+    ('plus',   { 'wireguard_address': '10.5.0.110','ssh_hostname': '10.2.0.35',                                      }),
 ]
--- a/package_lists.py	Thu Dec 14 16:46:37 2023 -0800
+++ b/package_lists.py	Thu Dec 28 16:38:05 2023 -0800
@@ -27,6 +27,7 @@
     'bsd-mailx',
     'emacs',
     'fdisk',
+    'flatpak',
     'hdparm',
     'isc-dhcp-client',
     'jq',
@@ -236,10 +237,11 @@
     'rclone',
     'recordmydesktop',
     'simple-scan',
+    'simplescreenrecorder',
     'solvespace',
     'sqlitebrowser',
     'sshfs',
-    'steam-installer',
+    'steam-launcher',
     'swi-prolog',
     'syncthing-gtk',
     'system-config-printer',
--- a/system.py	Thu Dec 14 16:46:37 2023 -0800
+++ b/system.py	Thu Dec 28 16:38:05 2023 -0800
@@ -67,4 +67,10 @@
 
 if host.name == 'prime':
     smaller_journals()
-    web_forward()
\ No newline at end of file
+    web_forward()
+
+# for space, consider:
+# k3s crictl rmi --prune
+# snap list --all | while read snapname ver rev trk pub notes; do if [[ $notes = *disabled* ]]; then snap remove "$snapname" --revision="$rev"; fi; done
+# podman system reset
+    
\ No newline at end of file
--- a/templates/sources.list.j2	Thu Dec 14 16:46:37 2023 -0800
+++ b/templates/sources.list.j2	Thu Dec 28 16:38:05 2023 -0800
@@ -2,21 +2,15 @@
 
 {% if host.name in ['dash', 'squib', 'slash', 'dot', 'plus'] %}
 deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/ms.gpg] http://packages.microsoft.com/repos/code stable main
-{% endif %}
-
-{% if host.name in ['dash', 'squib', 'slash', 'dot', 'plus'] %}
 deb [arch=amd64 signed-by=/etc/apt/keyrings/chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main
-{% endif %}
-
-{% if host.name in ['dash', 'squib', 'slash', 'dot', 'plus'] %}
 deb [arch=amd64,i386 signed-by=/usr/share/keyrings/steam.gpg] https://repo.steampowered.com/steam/ stable steam
 {% endif %}
 
-{% if host.name in ['bang', 'ditto', 'slash', 'dot'] %}
-deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x lunar main
+{% if host.name in ['ditto'] %}
+deb [signed-by=/etc/apt/keyrings/nodesource-older.gpg] https://deb.nodesource.com/node_18.x lunar main
 {% endif %}
 
-{% if host.name in ['dash', 'squib', 'plus'] %}
+{% if host.name in ['dash', 'squib', 'plus', 'bang', 'slash', 'dot'] %}
 deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main
 {% endif %}
 
@@ -24,7 +18,7 @@
 deb [signed-by=/etc/apt/keyrings/coral.gpg] https://packages.cloud.google.com/apt coral-edgetpu-stable main
 {% endif %}
 
-{% if host.name in ['dash', 'squib', 'plus'] %}
+{% if host.name in ['dash', 'squib', 'plus', 'bang', 'slash', 'dot', 'prime'] %}
 deb http://us.archive.ubuntu.com/ubuntu mantic main restricted
 deb http://us.archive.ubuntu.com/ubuntu mantic multiverse
 deb http://us.archive.ubuntu.com/ubuntu mantic universe
@@ -37,7 +31,7 @@
 deb http://us.archive.ubuntu.com/ubuntu mantic-updates universe
 {% endif %}
 
-{% if host.name in ['ditto', 'bang', 'slash', 'dot'] %}
+{% if host.name in ['ditto'] %}
 deb http://us.archive.ubuntu.com/ubuntu lunar main restricted
 deb http://us.archive.ubuntu.com/ubuntu lunar multiverse
 deb http://us.archive.ubuntu.com/ubuntu lunar universe
@@ -50,20 +44,8 @@
 deb http://us.archive.ubuntu.com/ubuntu lunar-updates universe
 {% endif %}
 
-{% if host.name in ['prime', 'squib'] %}
-deb http://us.archive.ubuntu.com/ubuntu kinetic main restricted
-deb http://us.archive.ubuntu.com/ubuntu kinetic multiverse
-deb http://us.archive.ubuntu.com/ubuntu kinetic universe
-deb http://us.archive.ubuntu.com/ubuntu kinetic-backports main restricted universe multiverse
-deb http://us.archive.ubuntu.com/ubuntu kinetic-security main restricted
-deb http://us.archive.ubuntu.com/ubuntu kinetic-security multiverse
-deb http://us.archive.ubuntu.com/ubuntu kinetic-security universe
-deb http://us.archive.ubuntu.com/ubuntu kinetic-updates main restricted
-deb http://us.archive.ubuntu.com/ubuntu kinetic-updates multiverse
-deb http://us.archive.ubuntu.com/ubuntu kinetic-updates universe
-{% endif %}
-
 {% if host.name in ['pipe'] %}
+# seems stuck on jammy since http://deb.odroid.in/n2/ and https://wiki.odroid.com/odroid-n2/os_images/ubuntu don't have anything newer (2023-12-28)
 deb http://archive.canonical.com/ubuntu jammy partner
 deb http://deb.odroid.in/n2/ jammy main
 deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted
@@ -80,7 +62,7 @@
 {% endif %}
 
 {% if host.name in ['garage'] %}
-deb http://archive.raspberrypi.org/debian/ bullseye main
-deb http://raspbian.raspberrypi.org/raspbian/ bullseye main contrib non-free rpi
+deb http://archive.raspberrypi.org/debian/ bookworm main
+deb http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi
 {% endif %}
 
--- a/wireguard_pubkey.py	Thu Dec 14 16:46:37 2023 -0800
+++ b/wireguard_pubkey.py	Thu Dec 28 16:38:05 2023 -0800
@@ -7,7 +7,7 @@
     'frontbed': 'ENhRhEgGaFfwV74MqYBHJgkOFpNAF5kVHVK5/tRVTjU=',
     'garage': 'kFMtVafPU8kJHYmdafc1g/OLRnNPQMGpYKcDqQ9rUjA=',
     'pipe': 'yI0zt8/+baHjadhiBCX6u8sSkhjoh/Q5cIZkGf1H6S4=',
-    'plus': 'tH2og4BbXaH6BrHSBd73Fx1XT0DxR8vjQxjqHFa913A=',
+    'plus': 'hRCwLRUGY3hYNHwsmxSmAPWqAvMr+ZM6IVAte8tLVyU=',
     'prime': 'vR9lfsUSOIMxkY/k2gRJ6E8ZudccfPpVhrbE9zuxalU=',
     'slash': 'dZSvwUPLKPrBWY66o8GNeWCcol6lK5QG80HLtOnCRko=',
 }