From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Thu, 18 Sep 2025 20:48:20 +0000 (-0600)
Subject: Accommodate changes in Debian 12: /etc/aliases, Netplan.
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=879e5a5c3713ba8e3a141a3a2908c038d86a7548;p=Institute

Accommodate changes in Debian 12: /etc/aliases, Netplan.

~webmaster~ and ~root~ was (recently?) included in the installed
=/etc/aliases=.

~gateway4~ was no longer accepted (without comment/warning?).
---

diff --git a/README.org b/README.org
index 13ee28f..f340084 100644
--- a/README.org
+++ b/README.org
@@ -2401,7 +2401,9 @@ core_ethernet:              enp0s3
             nameservers:
               search: [ {{ domain_priv }} ]
               addresses: [ {{ core_addr }} ]
-            gateway4: {{ gate_addr }}
+            routes:
+            - to: default
+              via: {{ gate_addr }}
     dest: /etc/netplan/60-core.yaml
     mode: u=rw,g=r,o=
   notify: Apply netplan.
@@ -3059,11 +3061,9 @@ installed by more specialized roles.
   become: yes
   blockinfile:
     block: |
-        webmaster:	root
         admin:		root
         www-data:	root
         monkey:		root
-        root:		{{ ansible_user }}
     path: /etc/aliases
     marker: "# {mark} INSTITUTE MANAGED BLOCK"
   notify: New aliases.
diff --git a/roles_t/core/tasks/main.yml b/roles_t/core/tasks/main.yml
index 9055035..bdc99ea 100644
--- a/roles_t/core/tasks/main.yml
+++ b/roles_t/core/tasks/main.yml
@@ -57,7 +57,9 @@
             nameservers:
               search: [ {{ domain_priv }} ]
               addresses: [ {{ core_addr }} ]
-            gateway4: {{ gate_addr }}
+            routes:
+            - to: default
+              via: {{ gate_addr }}
     dest: /etc/netplan/60-core.yaml
     mode: u=rw,g=r,o=
   notify: Apply netplan.
@@ -356,11 +358,9 @@
   become: yes
   blockinfile:
     block: |
-        webmaster:	root
         admin:		root
         www-data:	root
         monkey:		root
-        root:		{{ ansible_user }}
     path: /etc/aliases
     marker: "# {mark} INSTITUTE MANAGED BLOCK"
   notify: New aliases.