From f8629dd8496b2f057e8eebe13ff99959ecb40b12 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Mon, 11 Mar 2024 18:35:23 -0500 Subject: [PATCH] Wordsmithing. Merge Institute. --- Institute | 2 +- README.html | 63 ++++++++++++++++++++++++++--------------------------- README.org | 8 +++---- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/Institute b/Institute index 07607b9..13f9490 160000 --- a/Institute +++ b/Institute @@ -1 +1 @@ -Subproject commit 07607b9a071a812daf99d3972a51ef8069ca91a4 +Subproject commit 13f9490138e5a6629413d2ed55f1d46c804c830b diff --git a/README.html b/README.html index 79adba6..7001467 100644 --- a/README.html +++ b/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Birchwood Abbey Networks @@ -64,7 +64,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.
@@ -337,12 +337,11 @@ Apache configurations.
 Like the suggested per-user rewrite rule in the gitweb(1) manual
 page, the second RewriteRule specifies the root directory of the
 user's public Git repositories via the GITWEB_PROJECTROOT
-environment variable.  It makes http://www/~dick/gitweb.cgi run
+environment variable.  It makes http://www/~dick/git run
 Gitweb with the project root ~dick/Public/Git/, the same directory
 the git-daemon makes available.  The first RewriteRule directs
-URLs with no user name to the default.  Thus http://www/gitweb.cgi
-lists the repositories found in /var/www/git/.  The match patterns
-of both rules recognize /gitweb as well as /gitweb.cgi.
+URLs with no user name to the default.  Thus http://www/git
+lists the repositories found in /var/www/git/.
 

 
 

@@ -352,10 +351,10 @@ Alias /gitweb-static/ /usr/share/gitweb/static/
     Options MultiViews
 </Directory>
 RewriteEngine on
-RewriteRule ^/gitweb(\.cgi)?(/.*)?$ \
-            /cgi-bin/gitweb.cgi$2 [QSA,L,PT]
-RewriteRule ^/\~([^\/]+)/gitweb(\.cgi)?(/.*)?$ \
-            /cgi-bin/gitweb.cgi$3 \
+RewriteRule ^/git(/.*)?$ \
+            /cgi-bin/gitweb.cgi$1 [QSA,L,PT]
+RewriteRule ^/\~([^\/]+)/git(/.*)?$ \
+            /cgi-bin/gitweb.cgi$2 \
             [QSA,E=GITWEB_PROJECTROOT:/home/$1/Public/Git/,L,PT]
 

 
@@ -696,7 +695,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
 ...
@@ -915,8 +914,8 @@ with Postfix and Dovecot, and providing essential localnet services:
 NTP, DNS and DHCP.
 

 
-

-
4.1. Include Abbey Variables

+

+
4.1. Include Abbey Variables

 

 

 In this abbey specific document, most abbey particulars are not
@@ -1114,8 +1113,8 @@ The abbey uses the Apt-Cacher:TNG package cache on Core.  The
 

 

 

-

-
4.8. Use Cloister Apt Cache

+

+
4.8. Use Cloister Apt Cache

 

 

 Core itself will benefit from using the package cache.
@@ -1769,8 +1768,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
@@ -1840,8 +1839,8 @@ Raspberry Pis (architecture aarch64) only.
 

 

 

-

-
6.3. Install Emacs

+

+
6.3. Install Emacs

 

 

 The monks of the abbey are masters of the staff and Emacs.
@@ -1908,7 +1907,7 @@ Listing them (e.g. running owdir /26.nnnnnnnn or owdir
 below.  A test session is shown below.
 

 
-
+
 monkey@new$ owdir
 ...
     /26.2153B6000000/
@@ -2344,8 +2343,8 @@ described in the final section, Configure Cameras, bel
 

 

 

-

-
8.4. Include Abbey Variables

+

+
8.4. Include Abbey Variables

 

 

 Private variables in private/vars-abbey.yml are needed, and included
@@ -2725,7 +2724,7 @@ of area broadcasts.
 

 The Abbey TVR Role installs the MythTV backend and the MythWeb web
 interface on the master server.  It configures the Apache web server
-to serve MythWeb pages at e.g. http://NEW/mythweb/.
+to serve MythWeb pages at e.g. http://new/mythweb/.
 

 

 

@@ -2771,8 +2770,8 @@ machine simply by adding it to the tvrs group.
 

 

 

-

-
9.3. Include Abbey Variables

+

+
9.3. Include Abbey Variables

 

 

 Private variables in private/vars-abbey.yml are needed, as in the
@@ -2869,7 +2868,7 @@ following.
 
 

 The tasks above install runtime and compile-time requisites during the
-"first" run of e.g. ./abbey config NEW.  The "first" run can be
+"first" run of e.g. ./abbey config new.  The "first" run can be
 repeated until successful.  The remaining tasks are skipped until
 MythTV is built and installed.
 

@@ -2879,7 +2878,7 @@ MythTV is built and installed.
 
9.5. Build and Install MythTV

 

 

-After a successful "first" run of e.g. ./abbey config NEW, the
+After a successful "first" run of e.g. ./abbey config new, the
 target machine is prepared to build (and install) MythTV.  The
 following commands are used.
 

@@ -3168,7 +3167,7 @@ addressed, MythTV Setup (the mythtv-setup program) can be run.  It
 must be run by the mythtv user, whose home directory will contain
 the MythTV (and XMLTV) configuration files.  The program is best run
 remotely (unless there is a graphical desktop on the server) by a
-command like ssh -X mythtv@NEW mythtv-setup.
+command like ssh -X mythtv@new mythtv-setup.
 

 
 

@@ -3317,7 +3316,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]
@@ -4822,7 +4821,7 @@ to private/db.campus_vpn.)
 

 

 
Author: Matt Birkholz

-
Created: 2024-03-09 Sat 10:14

+
Created: 2024-03-11 Mon 17:33

 
Validate

 

 
diff --git a/README.org b/README.org
index 97034ec..fc962ff 100644
--- a/README.org
+++ b/README.org
@@ -2335,7 +2335,7 @@ of area broadcasts.
 
 The Abbey TVR Role installs the MythTV backend and the MythWeb web
 interface on the master server.  It configures the Apache web server
-to serve MythWeb pages at e.g. ~http://NEW/mythweb/~.
+to serve MythWeb pages at e.g. ~http://new/mythweb/~.
 
 ** Building MythTV and MythWeb
 
@@ -2452,13 +2452,13 @@ index 7a1a0bc..26ba782 100644
 #+END_SRC
 
 The tasks above install runtime and compile-time requisites during the
-"first" run of e.g. ~./abbey config NEW~.  The "first" run can be
+"first" run of e.g. ~./abbey config new~.  The "first" run can be
 repeated until successful.  The remaining tasks are skipped until
 MythTV is built and installed.
 
 ** Build and Install MythTV
 
-After a successful "first" run of e.g. ~./abbey config NEW~, the
+After a successful "first" run of e.g. ~./abbey config new~, the
 target machine is prepared to build (and install) MythTV.  The
 following commands are used.
 
@@ -2695,7 +2695,7 @@ addressed, MythTV Setup (the ~mythtv-setup~ program) can be run.  It
 must be run by the ~mythtv~ user, whose home directory will contain
 the MythTV (and XMLTV) configuration files.  The program is best run
 remotely (unless there is a graphical desktop on the server) by a
-command like ~ssh -X mythtv@NEW mythtv-setup~.
+command like ~ssh -X mythtv@new mythtv-setup~.
 
 Patience is required.  The ~mythtv-setup~ program was not written for
 X11 and the X11 adapter has a difficult job.  It is often hard to
-- 
2.47.3