Mercurial > code > home > repos > infra

changeset 297:d000aead76d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add tofu
author drewp@bigasterisk.com
date Wed, 15 May 2024 17:38:52 -0700
parents a3b7b558b9b5
children 5f3e053ba888
files apt.py inventory.py templates/dnsmasq/hosts.j2 templates/wireguard/wg0.conf.j2 wireguard_pubkey.py
diffstat 5 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/apt.py	Tue May 07 16:55:58 2024 -0700
+++ b/apt.py	Wed May 15 17:38:52 2024 -0700
@@ -23,7 +23,7 @@
     # and it makes this, which is redundant with my sources.list template line
     files.file(path='/etc/apt/sources.list.d/vscode.list', present=False)
 
-    apt.packages(packages=['curl'])
+    apt.packages(packages=['curl', 'gpg'])
     server.shell(commands=[
         f"curl -fsSL {shlex.quote(url)} | gpg --dearmor > /etc/apt/keyrings/{name}" for (url, name) in [
             ('https://packages.microsoft.com/keys/microsoft.asc', 'ms.gpg'),
--- a/inventory.py	Tue May 07 16:55:58 2024 -0700
+++ b/inventory.py	Wed May 15 17:38:52 2024 -0700
@@ -25,4 +25,5 @@
 laptop = [
     ('plus'      , {                'drewp_gid': 1000, 'drewp_home': True, 'drewp_uid': 501,                                          'ssh_hostname': '10.2.0.35'      , 'syncthing': True, 'wg_roamer': True, 'wireguard_address': '10.5.0.110', }),
     ('pillow'    , {                'drewp_gid': 1000,                     'drewp_uid': 1000 ,                                        'ssh_hostname': '10.5.0.111' ,     'syncthing': True, 'wg_roamer': True, 'wireguard_address': '10.5.0.111', }),
+    ('tofu'    ,     {                'drewp_gid': 1000,                     'drewp_uid': 501 ,                                        'ssh_hostname': '10.2.0.137' ,     'syncthing': True, 'wg_roamer': True, 'wireguard_address': '10.5.0.113', }),
 ]
--- a/templates/dnsmasq/hosts.j2	Tue May 07 16:55:58 2024 -0700
+++ b/templates/dnsmasq/hosts.j2	Wed May 15 17:38:52 2024 -0700
@@ -32,6 +32,7 @@
 10.5.0.110 plus5.bigasterisk.com
 10.5.0.111 pillow.bigasterisk.com pillow5.bigasterisk.com
 10.5.0.112 drew-note5.bigasterisk.com
+10.5.0.113 tofu.bigasterisk.com tofu5.bigasterisk.com
 
 {% if net == '10.2' %}
 # Hosts with fixed addrs who don't introduce via dhcp:
--- a/templates/wireguard/wg0.conf.j2	Tue May 07 16:55:58 2024 -0700
+++ b/templates/wireguard/wg0.conf.j2	Wed May 15 17:38:52 2024 -0700
@@ -26,6 +26,7 @@
     {{ peer_block('drew-note10', '10.5.0.112/32') }}
     {{ peer_block('plus',        '10.5.0.110/32', 'public.bigasterisk.com:1195') }}
     {{ peer_block('pillow',      '10.5.0.111/32', 'public.bigasterisk.com:1195') }}
+    {{ peer_block('tofu',        '10.5.0.113/32', 'public.bigasterisk.com:1195') }}
 {% elif host.data.get('wg_roamer') %}
     {{ peer_block('prime',       '10.5.0.0/24', 'public.bigasterisk.com:1195', 50) }}
 {% else %}
--- a/wireguard_pubkey.py	Tue May 07 16:55:58 2024 -0700
+++ b/wireguard_pubkey.py	Wed May 15 17:38:52 2024 -0700
@@ -14,6 +14,7 @@
     'ws-printer': 'HGQkw9ayf4g73s8Rvj76nUCIzr5oDqNVx3GuGq6Xvnw=',
     'li-drums': 'CkFzBGjSJLHnR7FeWzandx2F03x5tncaqpCuiNcIoCc=',
     'gn-music': 'XKkjSfdvROkLe0zxp9wal+ObTWqh/o7kJTXL8O9AOSQ=',
+    'tofu': 'abh0iwycB8kPY1yiI18dppil7/20/IskaHMRboTg2Qg=',
 }
 
 pubkey.update({