Mercurial > code > home > repos > infra

changeset 71:52156d3898c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mostly per-host network settings
author drewp@bigasterisk.com
date Sat, 11 Jun 2022 22:55:10 -0700
parents 136d86d06ce6
children f0e59adf7b91
files files/fstab/dash files/fstab/dot inventory.py templates/net/bang_10.1.network.j2 templates/net/bang_10.2.network.j2 templates/net/bang_isp.network.j2 templates/net/singlenic.network.j2 templates/wireguard/wg0.conf.j2 wireguard.py
diffstat 9 files changed, 26 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/files/fstab/dash	Sat Jun 11 22:53:23 2022 -0700
+++ b/files/fstab/dash	Sat Jun 11 22:55:10 2022 -0700
@@ -3,6 +3,6 @@
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
 /dev/disk/by-uuid/3b6780e0-ec86-43be-8d09-e462dbad762e / ext4 defaults 0 0
 /dev/disk/by-uuid/b88f75cd-9022-4af9-a11b-5a5a1fbd3132 /d2 ext4 defaults 0 0
-/dev/disk/by-uuid/73bcd201-5f77-4f68-9fba-47835c3c1692 /prev ext4 defaults 0 0
+#/dev/disk/by-uuid/73bcd201-5f77-4f68-9fba-47835c3c1692 /prev ext4 defaults 0 0
 /swap.img	none	swap	sw	0	0
 bang5:/stor6/my /my nfs4 defaults 0 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/files/fstab/dot	Sat Jun 11 22:55:10 2022 -0700
@@ -0,0 +1,6 @@
+# written by pyinfra
+
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+/dev/disk/by-uuid/5a6ce8db-cde0-4c26-b6a4-08faef2e01a2 / ext4 defaults 0 0
+/swap.img	none	swap	sw	0	0
+/dev/disk/by-uuid/78f08fb8-28cb-4af0-a579-36d7875ed558 /d2 ext4 defaults 0 0
\ No newline at end of file
--- a/inventory.py	Sat Jun 11 22:53:23 2022 -0700
+++ b/inventory.py	Sat Jun 11 22:55:10 2022 -0700
@@ -6,8 +6,8 @@
         'wireguard_address': '10.5.0.1',
     }),  #
     ('dash', {
-        "mac": "b8:97:5a:17:d7:1f",
-        'ssh_hostname': 'dash',
+        "mac": "b8:97:5a:17:d7:1fzzz",
+        'ssh_hostname': '10.2.0.212',
         'wireguard_address': '10.5.0.5',
     }),
     ('slash', {
@@ -16,7 +16,7 @@
         'wireguard_address': '10.5.0.6',
     }),
     ('dot', {
-        'mac': '1c:c1:de:56:e6:70',
+        'mac': '1c:c1:de:56:e6:70zzz',
         'ssh_hostname': 'dot',
         'wireguard_address': '10.5.0.30',
     })
@@ -31,11 +31,11 @@
 ]
 
 pi = [
-    ('frontbed', {
-        'mac': 'b8:27:eb:e9:d3:44',
-        'ssh_hostname': 'frontbed',
-        'wireguard_address': '10.5.0.17',
-    }),
+#    ('frontbed', {
+#        'mac': 'b8:27:eb:e9:d3:44',
+#        'ssh_hostname': 'frontbed',
+#        'wireguard_address': '10.5.0.17',
+#    }),
     ('garage', {
         'mac': 'b8:27:eb:81:17:92',
         'ssh_hostname': 'garage',
--- a/templates/net/bang_10.1.network.j2	Sat Jun 11 22:53:23 2022 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-# written by pyinfra
-
-[Match]
-MACAddress=e8:39:35:46:0d:bb
-
-[Network]
-Address=10.1.0.1
-DNS=10.2.0.1
-Domains=bigasterisk.com
\ No newline at end of file
--- a/templates/net/bang_10.2.network.j2	Sat Jun 11 22:53:23 2022 -0700
+++ b/templates/net/bang_10.2.network.j2	Sat Jun 11 22:55:10 2022 -0700
@@ -4,6 +4,7 @@
 MACAddress=60:e3:27:04:4a:85
 
 [Network]
+DHCP=no
 Address=10.2.0.1/16
 DNS=10.2.0.1
-Domains=bigasterisk.com
\ No newline at end of file
+Domains=bigasterisk.com
--- a/templates/net/bang_isp.network.j2	Sat Jun 11 22:53:23 2022 -0700
+++ b/templates/net/bang_isp.network.j2	Sat Jun 11 22:55:10 2022 -0700
@@ -5,6 +5,7 @@
 
 [Network]
 # in particular, don't take DNS addrs from this dhcp server
+UseDNS=false
 DHCP=no
 Address=192.168.42.2/24
 Gateway=192.168.42.1
--- a/templates/net/singlenic.network.j2	Sat Jun 11 22:53:23 2022 -0700
+++ b/templates/net/singlenic.network.j2	Sat Jun 11 22:55:10 2022 -0700
@@ -1,7 +1,7 @@
 # written by pyinfra
 
 [Match]
-MACAddress={{ mac }}
+Name=*
 
 [Network]
 DHCP=yes
--- a/templates/wireguard/wg0.conf.j2	Sat Jun 11 22:53:23 2022 -0700
+++ b/templates/wireguard/wg0.conf.j2	Sat Jun 11 22:55:10 2022 -0700
@@ -19,10 +19,7 @@
     {{ peer_block('plus',        'tH2og4BbXaH6BrHSBd73Fx1XT0DxR8vjQxjqHFa913A=', '10.5.0.110/32') }}
     {{ peer_block('drew-note10', 'QMgx4cmuUTfJ7RH4Q46b54tSQl4eISOmdEney17fnE8=', '10.5.0.112/32') }}
 {% elif host.name == 'plus' %}
-    {{ peer_block('bang',        'pAxirNVF08R6zYyudhTKjZ9fqC9UKMxknfLi5A39QVY=', '10.5.0.0/24', '10.1.0.1:1195', 50) }}
-{% elif host.name in ['dash', 'slash'] %}
-    # I see bang at 10.1.0.1
-    {{ peer_block('bang',        'pAxirNVF08R6zYyudhTKjZ9fqC9UKMxknfLi5A39QVY=', '10.5.0.0/24', '10.1.0.1:1195', 50) }}
+    {{ peer_block('bang',        'pAxirNVF08R6zYyudhTKjZ9fqC9UKMxknfLi5A39QVY=', '10.5.0.0/24', '10.2.0.1:1195', 50) }}
 {% else %}
     # I see bang at 10.2.0.1
     {{ peer_block('bang',        'pAxirNVF08R6zYyudhTKjZ9fqC9UKMxknfLi5A39QVY=', '10.5.0.0/24', '10.2.0.1:1195', 50) }}
--- a/wireguard.py	Sat Jun 11 22:53:23 2022 -0700
+++ b/wireguard.py	Sat Jun 11 22:55:10 2022 -0700
@@ -57,3 +57,9 @@
     files.link(path=f'/etc/systemd/system/multi-user.target.wants/{svc}', target='/lib/systemd/system/wg-quick@.service')
 
     systemd.service(service=svc, daemon_reload=True, restarted=True, enabled=True)
+
+if host.name == 'bang':
+    # recompute, or else maybe dnsmasq_10.5 won't start
+    server.shell("systemctl enable dnsmasq_10.2.service")
+    server.shell("systemctl enable dnsmasq_10.5.service")
+    server.shell("systemctl enable wg-quick@wg0.service")
\ No newline at end of file