projects / Network / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 42f60ca)
Fixes to get ./abbey config working.
authorMatt Birkholz <matt@birchwood-abbey.net>
Mon, 18 Dec 2023 17:33:40 +0000 (10:33 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Mon, 18 Dec 2023 17:33:40 +0000 (10:33 -0700)
README.html patch | blob | history
README.org patch | blob | history
hosts patch | blob | history
roles_t/abbey-core/tasks/main.yml patch | blob | history
roles_t/abbey-front/tasks/main.yml patch | blob | history

diff --git a/README.html b/README.html
index 1015cd38520989c5967e45fb234de0bfaff0de77..e9506bf48e3c9328c02be6df57f8f9ab76db9a96 100644 (file)
--- a/README.html
+++ b/README.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2023-12-17 Sun 16:05 -->
+<!-- 2023-12-18 Mon 10:33 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Birchwood Abbey Networks</title>
@@ -65,7 +65,7 @@ map is very similar, with differences mainly in terminology,
 philosophy, attitude.
 </p>
 
-<pre class="example" id="orga98e579">
+<pre class="example" id="org3fe2c3e">
                 |                                                   
                 =                                                   
               _|||_                                                 
@@ -136,8 +136,8 @@ with Apache2, spooling email with Postfix and serving it with
 Dovecot-IMAPd, and hosting a VPN with OpenVPN.
 </p>
 </div>
-<div id="outline-container-org0d60f6a" class="outline-3">
-<h3 id="org0d60f6a"><span class="section-number-3">3.1.</span> Install Emacs</h3>
+<div id="outline-container-org4b97d6a" class="outline-3">
+<h3 id="org4b97d6a"><span class="section-number-3">3.1.</span> Install Emacs</h3>
 <div class="outline-text-3" id="text-3-1">
 <p>
 The monks of the abbey are masters of the staff (bo) and Emacs.
@@ -514,8 +514,7 @@ RewriteRule ^/\~([^\/]+)/cgit(/.*)?$ \
 </div>
 
 <div class="org-src-container">
-<code>apache-cgi-tasks</code><pre class="src src-conf" id="org50bf153">
-- name: Install CGit.
+<code>apache-cgi-tasks</code><pre class="src src-conf" id="org50bf153">- name: Install CGit.
   become: yes
   <span class="org-variable-name">apt: pkg</span>=cgit
 
@@ -531,7 +530,7 @@ RewriteRule ^/\~([^\/]+)/cgit(/.*)?$ \
     path: /etc/cgitrc
     regexp: <span class="org-string">"^scan-path *="</span>
     line: <span class="org-string">"scan-path=$CGIT_SCANPATH"</span>
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 </pre>
 </div>
 </div>
@@ -713,7 +712,7 @@ discussed in the following <a href="#orgdc68478">Install Let's Encrypt</a> secti
     path: /etc/cgitrc
     regexp: <span class="org-string">"^scan-path *="</span>
     line: <span class="org-string">"scan-path=$CGIT_SCANPATH"</span>
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 </pre>
 </div>
 
@@ -868,7 +867,7 @@ certificate is a terminal session affair (with prompts and lines
 entered as shown below).
 </p>
 
-<pre class="example" id="org489c6c5">
+<pre class="example" id="org8ae15d2">
 $ 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 <a href="#org158c789"><cod
     path: /etc/cgitrc
     regexp: <span class="org-string">"^scan-path *="</span>
     line: <span class="org-string">"scan-path=$CGIT_SCANPATH"</span>
-  notify: Reload Apache2.
+  notify: Restart Apache2.
 </pre>
 </div>
 
@@ -1446,8 +1445,8 @@ The abbey uses the Apt-Cacher:TNG package cache on Core.  The
 </div>
 </div>
 </div>
-<div id="outline-container-orge2a23bc" class="outline-3">
-<h3 id="orge2a23bc"><span class="section-number-3">4.7.</span> Use Cloister Apt Cache</h3>
+<div id="outline-container-org5715c44" class="outline-3">
+<h3 id="org5715c44"><span class="section-number-3">4.7.</span> Use Cloister Apt Cache</h3>
 <div class="outline-text-3" id="text-4-7">
 <p>
 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.
 </p>
 </div>
-<div id="outline-container-org5715c44" class="outline-3">
-<h3 id="org5715c44"><span class="section-number-3">6.1.</span> Use Cloister Apt Cache</h3>
+<div id="outline-container-orge1c4717" class="outline-3">
+<h3 id="orge1c4717"><span class="section-number-3">6.1.</span> Use Cloister Apt Cache</h3>
 <div class="outline-text-3" id="text-6-1">
 <p>
 The Apt-Cacher:TNG program does not work well on the frontier, so is
@@ -2116,8 +2115,8 @@ Raspberry Pis (architecture <code>aarch64</code>) only.
 </div>
 </div>
 </div>
-<div id="outline-container-org4b97d6a" class="outline-3">
-<h3 id="org4b97d6a"><span class="section-number-3">6.3.</span> Install Emacs</h3>
+<div id="outline-container-org1de052d" class="outline-3">
+<h3 id="org1de052d"><span class="section-number-3">6.3.</span> Install Emacs</h3>
 <div class="outline-text-3" id="text-6-3">
 <p>
 The monks of the abbey are masters of the staff and Emacs.
@@ -2184,7 +2183,7 @@ Listing them (e.g. running <code>owdir /26.nnnnnnnn</code> or <code>owdir
 below.  A test session is shown below.
 </p>
 
-<pre class="example" id="org58a9437">
+<pre class="example" id="orgb93b6b1">
 monkey@new$ owdir
 ...
     /26.2153B6000000/
@@ -2620,8 +2619,8 @@ described in the final section, <a href="#org1115114">Configure Cameras</a>, bel
 </p>
 </div>
 </div>
-<div id="outline-container-org2556ab2" class="outline-3">
-<h3 id="org2556ab2"><span class="section-number-3">8.4.</span> Include Abbey Variables</h3>
+<div id="outline-container-orgf7717ca" class="outline-3">
+<h3 id="orgf7717ca"><span class="section-number-3">8.4.</span> Include Abbey Variables</h3>
 <div class="outline-text-3" id="text-8-4">
 <p>
 In this abbey specific document, most abbey particulars are not
@@ -3055,8 +3054,8 @@ machine simply by adding it to the <code>tvrs</code> group.
 </p>
 </div>
 </div>
-<div id="outline-container-orgf7717ca" class="outline-3">
-<h3 id="orgf7717ca"><span class="section-number-3">9.3.</span> Include Abbey Variables</h3>
+<div id="outline-container-org0a2e0ac" class="outline-3">
+<h3 id="org0a2e0ac"><span class="section-number-3">9.3.</span> Include Abbey Variables</h3>
 <div class="outline-text-3" id="text-9-3">
 <p>
 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.
 </p>
 
-<pre class="example" id="orgb68ecfe">
+<pre class="example" id="org4ac4fc8">
 $ 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 <q>Institute/roles/</q> as well as <q>roles/</q>.
       ansible_host: 159.65.75.60
       ansible_become_password: <span class="org-string">"{{ become_droplet }}"</span>
     anoat:
-      ansible_host: {{ gate_addr }}
       ansible_become_password: <span class="org-string">"{{ become_anoat }}"</span>
     dantooine:
-      ansible_host: {{ core_addr }}
       ansible_become_password: <span class="org-string">"{{ become_dantooine }}"</span>
     <span class="org-comment-delimiter"># </span><span class="org-comment">WebTVs (Desktops)</span>
     devaron:
@@ -5040,7 +5037,7 @@ to <q>private/db.campus_vpn</q>.)
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Matt Birkholz</p>
-<p class="date">Created: 2023-12-17 Sun 16:05</p>
+<p class="date">Created: 2023-12-18 Mon 10:33</p>
 <p class="validation"><a href="https://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/README.org b/README.org
index e66ae4832b4da5c59eabde6d69bd340bb516898e..86933fe08798c070ba040b48ee25e49a34a5f449 100644 (file)
--- 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.
 
 <<apache-gitweb-tasks>>
+
 <<apache-cgit-tasks>>
 #+END_SRC
 
@@ -947,6 +947,7 @@ site on Front.  Their configurations include the same [[apache-abbey][~apache-ab
   notify: Restart Apache2.
 
 <<apache-gitweb-tasks>>
+
 <<apache-cgit-tasks>>
 #+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 68b3df119e6cd88c1248deba49178af1218578e0..065a52c0222e709d9fdd5f8a72ba19fa7659ffc9 100644 (file)
--- 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 627d6304da892ec69782069aba33311d5f783522..6ee4ccfd256be5548d65a1b9251d8601755de99b 100644 (file)
--- 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 d36981522b923e8b2f9bd69a95bb1283e1990f34..1aba984e87d1e052113a2b0479b145e3d21c2e79 100644 (file)
--- 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
Birchwood Abbey Networking