Double-down on revealing domain_priv as birchwood.private.

This started in "Configure Private Email Aliases" which would be
awkward without simple examples, so... no "domain_priv" in README.org!

diff --git a/README.org b/README.org
index a529f46a8e036412bf9c487f903415aab3dcaeca..eb8b68570314a178a929aa62044d52d6b65fdb6c 100644 (file)
--- a/README.org
+++ b/README.org
@@ -455,7 +455,7 @@ rest of the Let's Encrypt configuration is discussed in the following
         <<apache-gitweb>>
 
         IncludeOptional /etc/letsencrypt/options-ssl-apache.conf
-    dest: /etc/apache2/sites-available/{{ domain_name }}-vhost.conf
+    dest: /etc/apache2/sites-available/birchwood-abbey.net-vhost.conf
   notify: Restart Apache2.
 
 <<apache-gitweb-tasks>>
@@ -976,7 +976,7 @@ Core itself will benefit from using the package cache.
   copy:
     content: >
       Acquire::http::Proxy
-      "http://apt-cacher.{{ domain_priv }}.:3142";
+      "http://apt-cacher.birchwood.private.:3142";
     dest: /etc/apt/apt.conf.d/01proxy
     mode: u=rw,g=r,o=r
 #+END_SRC
@@ -1551,7 +1551,7 @@ while.
   copy:
     content: >
       Acquire::http::Proxy
-      "http://apt-cacher.{{ domain_priv }}.:3142";
+      "http://apt-cacher.birchwood.private.:3142";
     dest: /etc/apt/apt.conf.d/01proxy
     mode: u=rw,g=r,o=r
 #+END_SRC
@@ -3152,7 +3152,7 @@ all:
       ansible_user: matt
       ansible_become_password: "{{ become_geonosis }}"
       postfix_mydestination: >-
-        geonosis.{{ domain_priv }}
+        geonosis.birchwood.private
         geonosis
         geonosis.localdomain
         localhost.localdomain

diff --git a/hosts b/hosts
index e2e3728dbf23c16551f153627ec887cb745b8b4b..70455b5b33e508a153178d2cd8589951dde40cb7 100644 (file)
--- a/hosts
+++ b/hosts
@@ -25,7 +25,7 @@ all:
       ansible_user: matt
       ansible_become_password: "{{ become_geonosis }}"
       postfix_mydestination: >-
-        geonosis.{{ domain_priv }}
+        geonosis.birchwood.private
         geonosis
         geonosis.localdomain
         localhost.localdomain

diff --git a/roles_t/abbey-cloister/tasks/main.yml b/roles_t/abbey-cloister/tasks/main.yml
index 2e091a16cec45be9015a3b8f344a303c57cc061d..9be626f3914b1be5c96c32b3a2836a544da0205f 100644 (file)
--- a/roles_t/abbey-cloister/tasks/main.yml
+++ b/roles_t/abbey-cloister/tasks/main.yml
@@ -4,7 +4,7 @@
   copy:
     content: >
       Acquire::http::Proxy
-      "http://apt-cacher.{{ domain_priv }}.:3142";
+      "http://apt-cacher.birchwood.private.:3142";
     dest: /etc/apt/apt.conf.d/01proxy
     mode: u=rw,g=r,o=r
 

diff --git a/roles_t/abbey-core/tasks/main.yml b/roles_t/abbey-core/tasks/main.yml
index 802a9878cf4f54364b1055475b92f42908c180eb..39be63696a20c8bee74119fe38741b61effae3d9 100644 (file)
--- a/roles_t/abbey-core/tasks/main.yml
+++ b/roles_t/abbey-core/tasks/main.yml
@@ -181,7 +181,7 @@
   copy:
     content: >
       Acquire::http::Proxy
-      "http://apt-cacher.{{ domain_priv }}.:3142";
+      "http://apt-cacher.birchwood.private.:3142";
     dest: /etc/apt/apt.conf.d/01proxy
     mode: u=rw,g=r,o=r
 

diff --git a/roles_t/abbey-front/tasks/main.yml b/roles_t/abbey-front/tasks/main.yml
index aaeae03e9abaa15b166336738a596385ba037eb8..1b25a1e9b73dc2d5fa68ac6ace58d8d9a8986076 100644 (file)
--- a/roles_t/abbey-front/tasks/main.yml
+++ b/roles_t/abbey-front/tasks/main.yml
@@ -80,7 +80,7 @@
                     [QSA,E=GITWEB_PROJECTROOT:/home/$1/Public/Git/,L,PT]
 
         IncludeOptional /etc/letsencrypt/options-ssl-apache.conf
-    dest: /etc/apache2/sites-available/{{ domain_name }}-vhost.conf
+    dest: /etc/apache2/sites-available/birchwood-abbey.net-vhost.conf
   notify: Restart Apache2.
 
 - name: Enable Apache2 rewrite module for Gitweb.