From 6f30cd290f22672d4626fcc20f24df70ef0d3d93 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Tue, 27 Feb 2024 11:58:19 -0700 Subject: [PATCH] Merge Institute. Update site.yml with new "all" role. --- Institute | 2 +- README.html | 52 +++++++++++++++++++++++++--------------------- README.org | 12 +++++++---- playbooks/site.yml | 12 +++++++---- 4 files changed, 45 insertions(+), 33 deletions(-) diff --git a/Institute b/Institute index fca64b1..9d2a139 160000 --- a/Institute +++ b/Institute @@ -1 +1 @@ -Subproject commit fca64b12defac256c824af647dfc0200d608aec6 +Subproject commit 9d2a13981ada62cdaea97e9dbb82c811dbba2b14 diff --git a/README.html b/README.html index 34c26f8..25fe02b 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.
@@ -789,7 +789,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
 ...
@@ -1008,8 +1008,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
@@ -1332,8 +1332,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.
@@ -1987,8 +1987,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
@@ -2058,8 +2058,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.
@@ -2126,7 +2126,7 @@ Listing them (e.g. running owdir /26.nnnnnnnn or owdir
 below.  A test session is shown below.
 

 
-
+
 monkey@new$ owdir
 ...
     /26.2153B6000000/
@@ -2562,8 +2562,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
@@ -2989,8 +2989,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
@@ -3535,7 +3535,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]
@@ -3984,18 +3984,22 @@ institutional roles, then the liturgical roles.
 
 

 playbooks/site.yml
---
+- name: Configure All
+  hosts: all
+  roles: [ all ]
+
 - name: Configure Front
   hosts: front
   roles: [ front, abbey-front ]
 
-- name: Configure Core
-  hosts: core
-  roles: [ core, abbey-core ]
-
 - name: Configure Gate
   hosts: gate
   roles: [ gate ]
 
+- name: Configure Core
+  hosts: core
+  roles: [ core, abbey-core ]
+
 - name: Configure Cloister
   hosts: campus
   roles: [ campus, abbey-cloister ]
@@ -5034,7 +5038,7 @@ to private/db.campus_vpn.)
 

 

 
Author: Matt Birkholz

-
Created: 2024-02-26 Mon 20:06

+
Created: 2024-02-27 Tue 11:57

 
Validate

 

 
diff --git a/README.org b/README.org
index 19555ee..4165db5 100644
--- a/README.org
+++ b/README.org
@@ -3187,18 +3187,22 @@ institutional roles, then the liturgical roles.
 #+CAPTION: =playbooks/site.yml=
 #+BEGIN_SRC conf :tangle playbooks/site.yml :mkdirp yes
 ---
+- name: Configure All
+  hosts: all
+  roles: [ all ]
+
 - name: Configure Front
   hosts: front
   roles: [ front, abbey-front ]
 
-- name: Configure Core
-  hosts: core
-  roles: [ core, abbey-core ]
-
 - name: Configure Gate
   hosts: gate
   roles: [ gate ]
 
+- name: Configure Core
+  hosts: core
+  roles: [ core, abbey-core ]
+
 - name: Configure Cloister
   hosts: campus
   roles: [ campus, abbey-cloister ]
diff --git a/playbooks/site.yml b/playbooks/site.yml
index 45daa90..a294cc4 100644
--- a/playbooks/site.yml
+++ b/playbooks/site.yml
@@ -1,16 +1,20 @@
 ---
+- name: Configure All
+  hosts: all
+  roles: [ all ]
+
 - name: Configure Front
   hosts: front
   roles: [ front, abbey-front ]
 
-- name: Configure Core
-  hosts: core
-  roles: [ core, abbey-core ]
-
 - name: Configure Gate
   hosts: gate
   roles: [ gate ]
 
+- name: Configure Core
+  hosts: core
+  roles: [ core, abbey-core ]
+
 - name: Configure Cloister
   hosts: campus
   roles: [ campus, abbey-cloister ]
-- 
2.25.1