Fiddled whitespace, list syntax.

diff --git a/README.org b/README.org
index b35e1b65ba15f73d53c550874ded10f0196b372f..d7ae2719326eda8f668380462148da1b5b2cc461 100644 (file)
--- a/README.org
+++ b/README.org
@@ -737,7 +737,7 @@ campus_wg_net:
 campus_wg_net_mask:
          "{{ campus_wg_net_cidr | ansible.utils.ipaddr('netmask') }}"
 campus_wg_net_and_mask:
-    "{{ campus_wg_net }} {{ campus_wg_net_mask }}"
+                       "{{ campus_wg_net }} {{ campus_wg_net_mask }}"
 #+END_SRC
 
 The institute prefers to configure its services with IP addresses
@@ -1368,6 +1368,7 @@ delivery.
 
 #+CAPTION: [[file:roles_t/front/tasks/main.yml][=roles_t/front/tasks/main.yml=]]
 #+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml
+
 - name: Configure hostname.
   become: yes
   copy:
@@ -2361,9 +2362,11 @@ particulars and membership roll.
 - name: Include public variables.
   include_vars: ../public/vars.yml
   tags: accounts
+
 - name: Include private variables.
   include_vars: ../private/vars.yml
   tags: accounts
+
 - name: Include members.
   include_vars: "{{ lookup('first_found', membership_rolls) }}"
   tags: accounts
@@ -2567,8 +2570,8 @@ the real [[file:private/core-dhcpd.conf][=private/core-dhcpd.conf=]] (/not/ the
   become: yes
   lineinfile:
     path: /etc/default/isc-dhcp-server
-    line: INTERFACESv4="lan"
-    regexp: ^INTERFACESv4=
+    regexp: "^INTERFACESv4="
+    line: "INTERFACESv4=\"lan\""
   notify: Restart DHCP server.
 
 - name: Configure DHCP subnet.
@@ -3761,9 +3764,10 @@ Core and Campus (and thus Gate) machines.
     line: "{{ item.line }}"
     backrefs: yes
   loop:
-  - { regexp: "^( *cfg_file *=.*/localhost.cfg)", line: "#\\1" }
-  - { regexp: "^( *admin_email *= *)",
-      line: "\\1{{ ansible_user }}@localhost" }
+  - regexp: "^( *cfg_file *=.*/localhost.cfg)"
+    line: "#\\1"
+  - regexp: "^( *admin_email *= *)"
+    line: "\\1{{ ansible_user }}@localhost"
   notify: Reload NAGIOS4.
 
 - name: Configure NAGIOS4 contacts.
@@ -4367,8 +4371,8 @@ performance, as recommended by Nextcloud.
   become: yes
   lineinfile:
     path: /etc/php/8.2/apache2/php.ini
-    regexp: memory_limit *=
-    line: memory_limit = 768M
+    regexp: "memory_limit *="
+    line: "memory_limit = 768M"
 
 - name: Include PHP parameters for Nextcloud.
   become: yes
@@ -4771,6 +4775,7 @@ The following should be familiar boilerplate by now.
 - name: Include public variables.
   include_vars: ../public/vars.yml
   tags: accounts
+
 - name: Include private variables.
   include_vars: ../private/vars.yml
   tags: accounts
@@ -5100,12 +5105,12 @@ policy in =/etc/default/ufw=, and install the institute's rules in
     line: "{{ item.line }}"
     regexp: "{{ item.regexp }}"
   loop:
-  - { line: "DEFAULT_INPUT_POLICY=\"ACCEPT\"",
-      regexp: "^DEFAULT_INPUT_POLICY=" }
-  - { line: "DEFAULT_OUTPUT_POLICY=\"ACCEPT\"",
-      regexp: "^DEFAULT_OUTPUT_POLICY=" }
-  - { line: "DEFAULT_FORWARD_POLICY=\"DROP\"",
-      regexp: "^DEFAULT_FORWARD_POLICY=" }
+  - line: "DEFAULT_INPUT_POLICY=\"ACCEPT\""
+    regexp: "^DEFAULT_INPUT_POLICY="
+  - line: "DEFAULT_OUTPUT_POLICY=\"ACCEPT\""
+    regexp: "^DEFAULT_OUTPUT_POLICY="
+  - line: "DEFAULT_FORWARD_POLICY=\"DROP\""
+    regexp: "^DEFAULT_FORWARD_POLICY="
 
 - name: Configure UFW rules.
   become: yes
@@ -5306,6 +5311,7 @@ The following should be familiar boilerplate by now.
 ---
 - name: Include public variables.
   include_vars: ../public/vars.yml
+
 - name: Include private variables.
   include_vars: ../private/vars.yml
 #+END_SRC

diff --git a/roles_t/campus/tasks/main.yml b/roles_t/campus/tasks/main.yml
index 3e32d16753b50b9c80f480933139b86387a5b429..88b2755b960514245c10965b04b1f3ddf6d482a8 100644 (file)
--- a/roles_t/campus/tasks/main.yml
+++ b/roles_t/campus/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 - name: Include public variables.
   include_vars: ../public/vars.yml
+
 - name: Include private variables.
   include_vars: ../private/vars.yml
 

diff --git a/roles_t/core/tasks/main.yml b/roles_t/core/tasks/main.yml
index e96f1568f9c36ff6fee7e046d62c968e8eef3bda..0db4f9c4b6c22bff708ba1db249b02a77c3e5b24 100644 (file)
--- a/roles_t/core/tasks/main.yml
+++ b/roles_t/core/tasks/main.yml
@@ -2,9 +2,11 @@
 - name: Include public variables.
   include_vars: ../public/vars.yml
   tags: accounts
+
 - name: Include private variables.
   include_vars: ../private/vars.yml
   tags: accounts
+
 - name: Include members.
   include_vars: "{{ lookup('first_found', membership_rolls) }}"
   tags: accounts
@@ -74,8 +76,8 @@
   become: yes
   lineinfile:
     path: /etc/default/isc-dhcp-server
-    line: INTERFACESv4="lan"
-    regexp: ^INTERFACESv4=
+    regexp: "^INTERFACESv4="
+    line: "INTERFACESv4=\"lan\""
   notify: Restart DHCP server.
 
 - name: Configure DHCP subnet.
@@ -692,9 +694,10 @@
     line: "{{ item.line }}"
     backrefs: yes
   loop:
-  - { regexp: "^( *cfg_file *=.*/localhost.cfg)", line: "#\\1" }
-  - { regexp: "^( *admin_email *= *)",
-      line: "\\1{{ ansible_user }}@localhost" }
+  - regexp: "^( *cfg_file *=.*/localhost.cfg)"
+    line: "#\\1"
+  - regexp: "^( *admin_email *= *)"
+    line: "\\1{{ ansible_user }}@localhost"
   notify: Reload NAGIOS4.
 
 - name: Configure NAGIOS4 contacts.
@@ -791,8 +794,8 @@
   become: yes
   lineinfile:
     path: /etc/php/8.2/apache2/php.ini
-    regexp: memory_limit *=
-    line: memory_limit = 768M
+    regexp: "memory_limit *="
+    line: "memory_limit = 768M"
 
 - name: Include PHP parameters for Nextcloud.
   become: yes

diff --git a/roles_t/gate/tasks/main.yml b/roles_t/gate/tasks/main.yml
index f35cfed8daa6c1c4a0d8cc493fa78528e829e877..6f12701745dce3bd37baeeac1a9bb3768d22c68a 100644 (file)
--- a/roles_t/gate/tasks/main.yml
+++ b/roles_t/gate/tasks/main.yml
@@ -104,12 +104,12 @@
     line: "{{ item.line }}"
     regexp: "{{ item.regexp }}"
   loop:
-  - { line: "DEFAULT_INPUT_POLICY=\"ACCEPT\"",
-      regexp: "^DEFAULT_INPUT_POLICY=" }
-  - { line: "DEFAULT_OUTPUT_POLICY=\"ACCEPT\"",
-      regexp: "^DEFAULT_OUTPUT_POLICY=" }
-  - { line: "DEFAULT_FORWARD_POLICY=\"DROP\"",
-      regexp: "^DEFAULT_FORWARD_POLICY=" }
+  - line: "DEFAULT_INPUT_POLICY=\"ACCEPT\""
+    regexp: "^DEFAULT_INPUT_POLICY="
+  - line: "DEFAULT_OUTPUT_POLICY=\"ACCEPT\""
+    regexp: "^DEFAULT_OUTPUT_POLICY="
+  - line: "DEFAULT_FORWARD_POLICY=\"DROP\""
+    regexp: "^DEFAULT_FORWARD_POLICY="
 
 - name: Configure UFW rules.
   become: yes