From: Matt Birkholz Date: Sat, 9 Mar 2024 16:53:40 +0000 (-0600) Subject: Merge Institute. Update README.html. X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=4d880edfb9e5c036da446620faa81be04c68a10a;p=Network Merge Institute. Update README.html. --- diff --git a/Institute b/Institute index 9d2a139..07607b9 160000 --- a/Institute +++ b/Institute @@ -1 +1 @@ -Subproject commit 9d2a13981ada62cdaea97e9dbb82c811dbba2b14 +Subproject commit 07607b9a071a812daf99d3972a51ef8069ca91a4 diff --git a/README.html b/README.html index 25fe02b..79adba6 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. @@ -266,34 +266,7 @@ like git-tasks and git-handlers.

roles_t/abbey-front/tasks/main.yml
-- name: Install git daemon.
-  become: yes
-  apt: pkg=git-daemon-sysvinit
-
-- name: Configure git daemon.
-  become: yes
-  lineinfile:
-    path: /etc/default/git-daemon
-    regexp: "{{ item.patt }}"
-    line: "{{ item.line }}"
-  loop:
-  - patt: '^GIT_DAEMON_ENABLE *='
-    line: 'GIT_DAEMON_ENABLE=true'
-  - patt: '^GIT_DAEMON_OPTIONS *='
-    line: 'GIT_DAEMON_OPTIONS="--user-path=Public/Git"'
-  - patt: '^GIT_DAEMON_BASE_PATH *='
-    line: 'GIT_DAEMON_BASE_PATH="/var/www/git"'
-  - patt: '^GIT_DAEMON_DIRECTORY *='
-    line: 'GIT_DAEMON_DIRECTORY=" "'
-  notify: Restart git daemon.
-
-- name: Create /var/www/git/.
-  become: yes
-  file:
-    path: /var/www/git
-    state: directory
-    group: staff
-    mode: u=rwx,g=srwx,o=rx
+<<git-tasks>>
 
@@ -331,10 +304,7 @@ like git-tasks and git-handlers.
roles_t/abbey-front/handlers/main.yml
-
-- name: Restart git daemon.
-  become: yes
-  command: systemctl restart git-daemon
+<<git-handlers>>
 
@@ -567,84 +537,21 @@ rest of the Let's Encrypt configuration is discussed in the following docroot: /home/www copy: content: | - <Directory {{ docroot }}/Abbey/> - AllowOverride Indexes FileInfo - Options +Indexes +FollowSymLinks - </Directory> - - RedirectMatch /Photos$ /Photos/ - RedirectMatch /Photos/(20[0-9][0-9])_([0-9][0-9])_([0-9][0-9])$ \ - /Photos/$1_$2_$3/ - AliasMatch /Photos/(20[0-9][0-9])_([0-9][0-9])_([0-9][0-9])/(.+)$ \ - {{ docroot }}/Photos/$1/$2/$3/$4 - AliasMatch /Photos/(20[0-9][0-9])_([0-9][0-9])_([0-9][0-9])/$ \ - {{ docroot }}/Photos/$1/$2/$3/index.html - AliasMatch /Photos/$ {{ docroot }}/Photos/index.html - - Alias /gitweb-static/ /usr/share/gitweb/static/ - <Directory "/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 \ - [QSA,E=GITWEB_PROJECTROOT:/home/$1/Public/Git/,L,PT] + <<apache-abbey>> + <<apache-photos>> + <<apache-gitweb>> + IncludeOptional /etc/letsencrypt/options-ssl-apache.conf dest: /etc/apache2/sites-available/{{ domain_name }}-vhost.conf notify: Restart Apache2. -- name: Enable Apache2 rewrite module for Gitweb. - become: yes - apache2_module: name=rewrite - notify: Restart Apache2. - -- name: Enable Apache2 cgid module for Gitweb (Ubuntu). - become: yes - apache2_module: name=cgid - when: ansible_distribution == 'Ubuntu' - notify: Restart Apache2. - -- name: Enable Apache2 cgi module for Gitweb (Debian). - become: yes - apache2_module: name=cgi - when: ansible_distribution == 'Debian' - notify: Restart Apache2. - -- name: Install libcgi-pm-perl for Gitweb. - become: yes - apt: pkg=libcgi-pm-perl - -- name: Link Gitweb into /cgi-bin/. - become: yes - file: - state: link - path: /usr/lib/cgi-bin/{{ item }} - src: /usr/share/gitweb/{{ item }} - loop: [ gitweb.cgi, index.cgi ] - -- name: Override Gitweb assets location. - become: yes - copy: - content: | - $projectroot = $ENV{'GITWEB_PROJECTROOT'} || "/var/www/git"; - @stylesheets = ("/gitweb-static/gitweb.css"); - $logo = "/gitweb-static/git-logo.png"; - $favicon = "/favicon.ico"; - $javascript = "/gitweb-static/gitweb.js"; - dest: /etc/gitweb.conf - mode: u=rw,g=r,o=r +<<apache-gitweb-tasks>>
roles_t/abbey-front/handlers/main.yml
-- name: Restart Apache2.
-  become: yes
-  systemd:
-    service: apache2
-    state: restarted
+<<apache-gitweb-handlers>>
 
@@ -789,7 +696,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 +915,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 @@ -1101,43 +1008,13 @@ services on Front and Core. See 3.3 and

roles_t/abbey-core/tasks/main.yml
-- name: Install git daemon.
-  become: yes
-  apt: pkg=git-daemon-sysvinit
-
-- name: Configure git daemon.
-  become: yes
-  lineinfile:
-    path: /etc/default/git-daemon
-    regexp: "{{ item.patt }}"
-    line: "{{ item.line }}"
-  loop:
-  - patt: '^GIT_DAEMON_ENABLE *='
-    line: 'GIT_DAEMON_ENABLE=true'
-  - patt: '^GIT_DAEMON_OPTIONS *='
-    line: 'GIT_DAEMON_OPTIONS="--user-path=Public/Git"'
-  - patt: '^GIT_DAEMON_BASE_PATH *='
-    line: 'GIT_DAEMON_BASE_PATH="/var/www/git"'
-  - patt: '^GIT_DAEMON_DIRECTORY *='
-    line: 'GIT_DAEMON_DIRECTORY=" "'
-  notify: Restart git daemon.
-
-- name: Create /var/www/git/.
-  become: yes
-  file:
-    path: /var/www/git
-    state: directory
-    group: staff
-    mode: u=rwx,g=srwx,o=rx
+<<git-tasks>>
 
roles_t/abbey-core/handlers/main.yml
-
-- name: Restart git daemon.
-  become: yes
-  command: systemctl restart git-daemon
+<<git-handlers>>
 
@@ -1160,30 +1037,9 @@ site on Front. Their configurations include the same "/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 \ - [QSA,E=GITWEB_PROJECTROOT:/home/$1/Public/Git/,L,PT] + <<apache-abbey>> + <<apache-photos>> + <<apache-gitweb>> dest: /etc/apache2/sites-available/live-vhost.conf mode: u=rw,g=r,o=r notify: Restart Apache2. @@ -1194,84 +1050,20 @@ site on Front. Their configurations include the same "/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 \ - [QSA,E=GITWEB_PROJECTROOT:/home/$1/Public/Git/,L,PT] + <<apache-abbey>> + <<apache-photos>> + <<apache-gitweb>> dest: /etc/apache2/sites-available/test-vhost.conf mode: u=rw,g=r,o=r notify: Restart Apache2. -- name: Enable Apache2 rewrite module for Gitweb. - become: yes - apache2_module: name=rewrite - notify: Restart Apache2. - -- name: Enable Apache2 cgid module for Gitweb (Ubuntu). - become: yes - apache2_module: name=cgid - when: ansible_distribution == 'Ubuntu' - notify: Restart Apache2. - -- name: Enable Apache2 cgi module for Gitweb (Debian). - become: yes - apache2_module: name=cgi - when: ansible_distribution == 'Debian' - notify: Restart Apache2. - -- name: Install libcgi-pm-perl for Gitweb. - become: yes - apt: pkg=libcgi-pm-perl - -- name: Link Gitweb into /cgi-bin/. - become: yes - file: - state: link - path: /usr/lib/cgi-bin/{{ item }} - src: /usr/share/gitweb/{{ item }} - loop: [ gitweb.cgi, index.cgi ] - -- name: Override Gitweb assets location. - become: yes - copy: - content: | - $projectroot = $ENV{'GITWEB_PROJECTROOT'} || "/var/www/git"; - @stylesheets = ("/gitweb-static/gitweb.css"); - $logo = "/gitweb-static/git-logo.png"; - $favicon = "/favicon.ico"; - $javascript = "/gitweb-static/gitweb.js"; - dest: /etc/gitweb.conf - mode: u=rw,g=r,o=r +<<apache-gitweb-tasks>>
roles_t/abbey-core/handlers/main.yml
-- name: Restart Apache2.
-  become: yes
-  systemd:
-    service: apache2
-    state: restarted
+<<apache-gitweb-handlers>>
 
@@ -1297,17 +1089,7 @@ directives that enable user Git publishing with Gitweb (defined
"/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 \ - [QSA,E=GITWEB_PROJECTROOT:/home/$1/Public/Git/,L,PT] + <<apache-gitweb>> dest: /etc/apache2/sites-available/www-vhost.conf mode: u=rw,g=r,o=r notify: Restart Apache2. @@ -1332,8 +1114,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 +1769,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 +1840,8 @@ Raspberry Pis (architecture aarch64) only.

-
-

6.3. Install Emacs

+
-
-

8.4. Include Abbey Variables

+
+

8.4. Include Abbey Variables

Private variables in private/vars-abbey.yml are needed, and included @@ -2989,8 +2771,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 +3317,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]
@@ -3952,6 +3734,7 @@ except the roles are found in Institute/roles/ as well as roles/.
       hosts:
         anoat:
         devaron:
+        kamino:
         kessel:
     weather:
       hosts:
@@ -3970,6 +3753,7 @@ except the roles are found in Institute/roles/ as well as roles/.
       hosts:
         devaron:
         geonosis:
+        kamino:
 
@@ -5038,7 +4822,7 @@ to private/db.campus_vpn.)

Author: Matt Birkholz

-

Created: 2024-02-27 Tue 11:57

+

Created: 2024-03-09 Sat 10:14

Validate