From 332654ca446a064634b419d8d13a9979beae8478 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Mon, 29 Jan 2024 15:26:20 -0700
Subject: [PATCH] Add Include Abbey Variables to The Abbey Core Role

The NAGIOS configuration is wanting private network IP addresses
already introduced as devaron_addr, kamino_addr and kessel_addr.
---
 README.org | 57 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/README.org b/README.org
index 1877b57..513f940 100644
--- a/README.org
+++ b/README.org
@@ -787,6 +787,24 @@ with Apache2, hosting a private cloud with Nextcloud, handling email
 with Postfix and Dovecot, and providing essential localnet services:
 NTP, DNS and DHCP.
 
+** Include Abbey Variables
+
+In this abbey specific document, most abbey particulars are not
+replaced with variables, but specified in-line.  Some, however, are
+private (e.g. database passwords), not to be published in this
+document, and so replaced with variables set in
+=private/vars-abbey.yml=.
+
+#+CAPTION: =roles_t/abbey-core/tasks/main.yml=
+#+BEGIN_SRC conf :tangle roles_t/abbey-core/tasks/main.yml :mkdirp yes
+---
+- name: Include private abbey variables.
+  include_vars: ../private/vars-abbey.yml
+#+END_SRC
+
+The filename used above is interpreted relative to the playbook's
+directory, =playbooks/=.
+
 ** Install Additional Packages
 
 The scripts that maintain the abbey's web site and run the Weather
@@ -1105,7 +1123,24 @@ idiosyncratically in flux.  In particular, Kamino does not irritate
 Kessel is a wireless host while Kamino is wired.  Devaron, the
 Raspberry Pi OS (ARM64) machine, uses the ~abbey_pisensors~ monitor.
 
-Kamino is currently unmonitored as it is now rarely powered up.
+*** Cloister Network Addresses
+
+The IP addresses of all three hosts are nice to use in the NAGIOS
+configuration (to avoid depending on name service) and so are
+included in =private/vars-abbey.yml=.
+
+#+CAPTION: =private/vars-abbey.yml=
+#+BEGIN_SRC conf
+devaron_addr:               10.84.138.10
+kamino_addr:                192.168.56.14
+kessel_addr:                10.84.138.8
+#+END_SRC
+
+*** Installing NAGIOS Configurations
+
+The following task installs each host's NAGIOS configuration.  Note
+that Kamino is not included.  It is currently unmonitored as it is now
+rarely powered up.
 
 #+CAPTION: =roles_t/abbey-core/tasks/main.yml=
 #+BEGIN_SRC conf :tangle roles_t/abbey-core/tasks/main.yml
@@ -1119,6 +1154,8 @@ Kamino is currently unmonitored as it is now rarely powered up.
   notify: Reload NAGIOS4.
 #+END_SRC
 
+*** NAGIOS Monitoring of Devaron
+
 #+CAPTION: =roles_t/abbey-core/templates/nagios-devaron.cfg=
 #+BEGIN_SRC conf :tangle roles_t/abbey-core/templates/nagios-devaron.cfg :mkdirp yes
 define host {
@@ -1170,6 +1207,8 @@ define service {
 }
 #+END_SRC
 
+*** NAGIOS  Monitoring of Kamino
+
 #+CAPTION: =roles_t/abbey-core/templates/nagios-kamino.cfg=
 #+BEGIN_SRC conf :tangle roles_t/abbey-core/templates/nagios-kamino.cfg
 define host {
@@ -1221,6 +1260,8 @@ define service {
 }
 #+END_SRC
 
+*** NAGIOS Monitoring of Kessel
+
 #+CAPTION: =roles_t/abbey-core/templates/nagios-kessel.cfg=
 #+BEGIN_SRC conf :tangle roles_t/abbey-core/templates/nagios-kessel.cfg
 define host {
@@ -1974,11 +2015,8 @@ described in the final section, [[*Configure Cameras][Configure Cameras]], below
 
 ** Include Abbey Variables
 
-In this abbey specific document, most abbey particulars are not
-replaced with variables, but specified in-line.  Some, however, are
-not published (e.g. database passwords).  The variables that replace
-them are included from =private/vars-abbey.yml=.  Example values are
-given in this document.
+Private variables in =private/vars-abbey.yml= are needed, and included
+here, as in the ~abbey-core~ role.
 
 #+CAPTION: =roles_t/abbey-dvr/tasks/main.yml=
 #+BEGIN_SRC conf :tangle roles_t/abbey-dvr/tasks/main.yml :mkdirp yes
@@ -2327,11 +2365,8 @@ machine simply by adding it to the ~tvrs~ group.
 
 ** Include Abbey Variables
 
-In this abbey specific document, most abbey particulars are not
-replaced with variables, but specified in-line.  Some, however, are
-not published (e.g. database passwords).  The variables that replace
-them are included from =private/vars-abbey.yml=.  Example values are
-given in this document.
+Private variables in =private/vars-abbey.yml= are needed, as in the
+~abbey-core~ role.
 
 #+CAPTION: =roles_t/abbey-tvr/tasks/main.yml=
 #+BEGIN_SRC conf :tangle roles_t/abbey-tvr/tasks/main.yml :mkdirp yes
-- 
2.25.1