From 50fe19f5e956a78354d61a0e8ca11d20fde7c33d Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Mon, 18 Dec 2023 10:33:40 -0700 Subject: [PATCH] Fixes to get ./abbey config working. --- README.html | 47 ++++++++++++++---------------- README.org | 7 ++--- hosts | 2 -- roles_t/abbey-core/tasks/main.yml | 2 +- roles_t/abbey-front/tasks/main.yml | 2 +- 5 files changed, 27 insertions(+), 33 deletions(-) diff --git a/README.html b/README.html index 1015cd3..e9506bf 100644 --- a/README.html +++ b/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Birchwood Abbey Networks @@ -65,7 +65,7 @@ map is very similar, with differences mainly in terminology, philosophy, attitude.

-
+
                 |                                                   
                 =                                                   
               _|||_                                                 
@@ -136,8 +136,8 @@ with Apache2, spooling email with Postfix and serving it with
 Dovecot-IMAPd, and hosting a VPN with OpenVPN.
 

 
-

-
3.1. Install Emacs

+

+
3.1. Install Emacs

 

 

 The monks of the abbey are masters of the staff (bo) and Emacs.
@@ -514,8 +514,7 @@ RewriteRule ^/\~([^\/]+)/cgit(/.*)?$ \
 

 
 

-apache-cgi-tasks
-- name: Install CGit.
+apache-cgi-tasks
- name: Install CGit.
   become: yes
   apt: pkg=cgit
 
@@ -531,7 +530,7 @@ RewriteRule ^/\~([^\/]+)/cgit(/.*)?$ \
     path: /etc/cgitrc
     regexp: "^scan-path *="
     line: "scan-path=$CGIT_SCANPATH"
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 

 

 

@@ -713,7 +712,7 @@ discussed in the following Install Let's Encrypt secti
     path: /etc/cgitrc
     regexp: "^scan-path *="
     line: "scan-path=$CGIT_SCANPATH"
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 

 
 
@@ -868,7 +867,7 @@ certificate is a terminal session affair (with prompts and lines
 entered as shown below).
 

 
-
+
 $ sudo apt install python3-certbot-apache
 $ sudo certbot --apache -d birchwood-abbey.net
 ...
@@ -1362,7 +1361,7 @@ site on Front.  Their configurations include the same "^scan-path *="
     line: "scan-path=$CGIT_SCANPATH"
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 

 
 
@@ -1446,8 +1445,8 @@ The abbey uses the Apt-Cacher:TNG package cache on Core.  The
 
 
 
-

-
4.7. Use Cloister Apt Cache

+

+
4.7. Use Cloister Apt Cache

 

 

 Core itself will benefit from using the package cache.
@@ -2045,8 +2044,8 @@ clients: Android, Debian and Campus.  The last type never roams, and
 is not associated with a member of the small institute.
 

 

-

-
6.1. Use Cloister Apt Cache

+

+
6.1. Use Cloister Apt Cache

 

 

 The Apt-Cacher:TNG program does not work well on the frontier, so is
@@ -2116,8 +2115,8 @@ Raspberry Pis (architecture aarch64) only.
 

 

 

-

-
6.3. Install Emacs

+
-

-
8.4. Include Abbey Variables

+

+
8.4. Include Abbey Variables

 

 

 In this abbey specific document, most abbey particulars are not
@@ -3055,8 +3054,8 @@ machine simply by adding it to the tvrs group.
 

 

 

-

-
9.3. Include Abbey Variables

+

+
9.3. Include Abbey Variables

 

 

 In this abbey specific document, most abbey particulars are not
@@ -3608,7 +3607,7 @@ the list of "inputs" available in a postal code typically ends with
 the OTA (over the air) broadcasts.
 

 
-
+
 $ tv_grab_zz_sdjson --configure --config-file .mythtv/Mr.Antenna.xmltv
 Cache file for lineups, schedules and programs.
 Cache file: [/home/mythtv/.xmltv/tv_grab_zz_sdjson.cache]
@@ -3989,10 +3988,8 @@ except the roles are found in Institute/roles/ as well as roles/.
       ansible_host: 159.65.75.60
       ansible_become_password: "{{ become_droplet }}"
     anoat:
-      ansible_host: {{ gate_addr }}
       ansible_become_password: "{{ become_anoat }}"
     dantooine:
-      ansible_host: {{ core_addr }}
       ansible_become_password: "{{ become_dantooine }}"
     # WebTVs (Desktops)
     devaron:
@@ -5040,7 +5037,7 @@ to private/db.campus_vpn.)
 

 

 
Author: Matt Birkholz

-
Created: 2023-12-17 Sun 16:05

+
Created: 2023-12-18 Mon 10:33

 
Validate

 

 
diff --git a/README.org b/README.org
index e66ae48..86933fe 100644
--- a/README.org
+++ b/README.org
@@ -404,7 +404,6 @@ RewriteRule ^/\~([^\/]+)/cgit(/.*)?$ \
 #+NAME: apache-cgit-tasks
 #+CAPTION: ~apache-cgi-tasks~
 #+BEGIN_SRC conf
-
 - name: Install CGit.
   become: yes
   apt: pkg=cgit
@@ -421,7 +420,7 @@ RewriteRule ^/\~([^\/]+)/cgit(/.*)?$ \
     path: /etc/cgitrc
     regexp: "^scan-path *="
     line: "scan-path=$CGIT_SCANPATH"
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 #+END_SRC
 
 ** Configure Apache for Abbey Documentation
@@ -501,6 +500,7 @@ discussed in the following [[*Install Let's Encrypt][Install Let's Encrypt]] sec
   notify: Restart Apache2.
 
 <>
+
 <>
 #+END_SRC
 
@@ -947,6 +947,7 @@ site on Front.  Their configurations include the same [[apache-abbey][~apache-ab
   notify: Restart Apache2.
 
 <>
+
 <>
 #+END_SRC
 
@@ -3138,10 +3139,8 @@ all:
       ansible_host: 159.65.75.60
       ansible_become_password: "{{ become_droplet }}"
     anoat:
-      ansible_host: {{ gate_addr }}
       ansible_become_password: "{{ become_anoat }}"
     dantooine:
-      ansible_host: {{ core_addr }}
       ansible_become_password: "{{ become_dantooine }}"
     # WebTVs (Desktops)
     devaron:
diff --git a/hosts b/hosts
index 68b3df1..065a52c 100644
--- a/hosts
+++ b/hosts
@@ -8,10 +8,8 @@ all:
       ansible_host: 159.65.75.60
       ansible_become_password: "{{ become_droplet }}"
     anoat:
-      ansible_host: {{ gate_addr }}
       ansible_become_password: "{{ become_anoat }}"
     dantooine:
-      ansible_host: {{ core_addr }}
       ansible_become_password: "{{ become_dantooine }}"
     # WebTVs (Desktops)
     devaron:
diff --git a/roles_t/abbey-core/tasks/main.yml b/roles_t/abbey-core/tasks/main.yml
index 627d630..6ee4ccf 100644
--- a/roles_t/abbey-core/tasks/main.yml
+++ b/roles_t/abbey-core/tasks/main.yml
@@ -193,7 +193,7 @@
     path: /etc/cgitrc
     regexp: "^scan-path *="
     line: "scan-path=$CGIT_SCANPATH"
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 
 - name: Configure house website.
   become: yes
diff --git a/roles_t/abbey-front/tasks/main.yml b/roles_t/abbey-front/tasks/main.yml
index d369815..1aba984 100644
--- a/roles_t/abbey-front/tasks/main.yml
+++ b/roles_t/abbey-front/tasks/main.yml
@@ -151,7 +151,7 @@
     path: /etc/cgitrc
     regexp: "^scan-path *="
     line: "scan-path=$CGIT_SCANPATH"
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 
 - name: Configure Apache log archival.
   become: yes
-- 
2.25.1