Mercurial > code > home > repos > infra

changeset 202:a5399e8b47b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade some ubuntu
author drewp@bigasterisk.com
date Fri, 30 Jun 2023 22:36:53 -0700
parents 2595cf510c5d
children 3fd439ae1380
files inventory.py package_lists.py tasks.py templates/sources.list.j2
diffstat 4 files changed, 36 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/inventory.py	Fri Jun 23 23:03:44 2023 -0700
+++ b/inventory.py	Fri Jun 30 22:36:53 2023 -0700
@@ -22,9 +22,9 @@
     ('ditto', {
         'wireguard_address': '10.5.0.7',
     }),
-    ('squib', {
-        'wireguard_address': '10.5.0.32',
-    }),
+    # ('squib', {
+    #     'wireguard_address': '10.5.0.32',
+    # }),
 ]
 
 small = [
@@ -42,7 +42,7 @@
 #   }),
    ('garage', {
        'mac': 'b8:27:eb:81:17:92',
-       'ssh_hostname': 'garage',
+       'ssh_hostname': '10.5.0.14',
        'mk_addr': '10.2.0.53',
        'wireguard_address': '10.5.0.14',
    }),
@@ -54,9 +54,9 @@
         'ssh_hostname': '162.243.138.136',
         'wireguard_address': '10.5.0.2',
     }),
-    ('plus', {
-        'ssh_hostname': 'plus',
-        'wireguard_address': '10.5.0.110',
-        'mk_addr': '10.2.0.48',
-    }),
+#    ('plus', {
+ #       'ssh_hostname': '10.5.0.110',
+ #       'wireguard_address': '10.5.0.110',
+ #       'mk_addr': '10.2.0.48',
+ #   }),
 ]
--- a/package_lists.py	Fri Jun 23 23:03:44 2023 -0700
+++ b/package_lists.py	Fri Jun 30 22:36:53 2023 -0700
@@ -52,7 +52,7 @@
 non_pi = [
     'lpr',
     'nfs-client',
-    #    'python3-dulwich', # desired, but it may depend on an old python3
+    'python3-dulwich', # desired, but it may depend on an old python3
     'python3-atomicwrites',
     'python3-invoke',
     'python3-pip',
@@ -212,6 +212,7 @@
     'libreoffice-draw',
     'libreoffice-impress',
     'libreoffice-writer',
+    'libfuse2', # for obsidian (appimage)
     'libxcb-xkb1',  # needed for kitty
     'lxterminal',
     'meld',
@@ -257,7 +258,7 @@
     'xterm',
     'xtightvncviewer',
     'xvfb',
-    #'libsubid4', # for podman ;failing on old bang OS version
+    'libsubid4', # for podman
     'buildah', # for podman
     #'cuda-minimal-build-11-8', some issue on slash
     #'libcudnn8', some issue on slash
--- a/tasks.py	Fri Jun 23 23:03:44 2023 -0700
+++ b/tasks.py	Fri Jun 30 22:36:53 2023 -0700
@@ -5,7 +5,7 @@
 export HOME
 eval `keychain --quiet --eval id_ecdsa`
 cd /my/proj/infra
-~drewp/bin/pdm run pyinfra '''
+pdm run pyinfra '''
 
 def _run(ctx, s):
     ctx.run(cmd + 'inventory.py %s' % s, pty=True, echo=True)
--- a/templates/sources.list.j2	Fri Jun 23 23:03:44 2023 -0700
+++ b/templates/sources.list.j2	Fri Jun 30 22:36:53 2023 -0700
@@ -18,14 +18,33 @@
 #deb [arch=amd64 signed-by=/etc/apt/keyrings/podman.gpg] https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_22.04/ /
 {% endif %}
 
-{% if host.name in ['bang', 'dot', 'plus'] %}
+{% if host.name in ['dot'] %}
 deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x jammy main
 {% endif %}
-{% if host.name in ['dash', 'squib', 'ditto', 'slash'] %}
+
+{% if host.name in ['squib', 'slash', 'plus'] %}
 deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x kinetic main
 {% endif %}
 
-{% if host.name in ['dash', 'squib', 'ditto', 'slash'] %}
+{% if host.name in ['dash', 'bang', 'ditto'] %}
+deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x lunar main
+{% endif %}
+
+
+{% if host.name in ['dash', 'ditto', 'bang'] %}
+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
+deb http://us.archive.ubuntu.com/ubuntu lunar-backports main restricted universe multiverse
+deb http://us.archive.ubuntu.com/ubuntu lunar-security main restricted
+deb http://us.archive.ubuntu.com/ubuntu lunar-security multiverse
+deb http://us.archive.ubuntu.com/ubuntu lunar-security universe
+deb http://us.archive.ubuntu.com/ubuntu lunar-updates main restricted
+deb http://us.archive.ubuntu.com/ubuntu lunar-updates multiverse
+deb http://us.archive.ubuntu.com/ubuntu lunar-updates universe
+{% endif %}
+
+{% if host.name in ['prime', 'squib', 'slash', 'plus'] %}
 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
@@ -38,20 +57,7 @@
 deb http://us.archive.ubuntu.com/ubuntu kinetic-updates universe
 {% endif %}
 
-{% if host.name in ['prime'] %}
-deb http://security.ubuntu.com/ubuntu kinetic-security main restricted
-deb http://security.ubuntu.com/ubuntu kinetic-security multiverse
-deb http://security.ubuntu.com/ubuntu kinetic-security universe
-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-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 ['bang', 'dot', 'plus'] %}
+{% if host.name in ['dot'] %}
 deb http://us.archive.ubuntu.com/ubuntu jammy main restricted
 deb http://us.archive.ubuntu.com/ubuntu jammy multiverse
 deb http://us.archive.ubuntu.com/ubuntu jammy universe