From 91620d054552d584a7ec7f3978cc99685b969341 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Mon, 3 Jun 2024 15:46:05 -0600 Subject: [PATCH] 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! --- README.org | 8 ++++---- hosts | 2 +- roles_t/abbey-cloister/tasks/main.yml | 2 +- roles_t/abbey-core/tasks/main.yml | 2 +- roles_t/abbey-front/tasks/main.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.org b/README.org index a529f46..eb8b685 100644 --- a/README.org +++ b/README.org @@ -455,7 +455,7 @@ rest of the Let's Encrypt configuration is discussed in the following <> 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. <> @@ -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 e2e3728..70455b5 100644 --- 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 2e091a1..9be626f 100644 --- 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 802a987..39be636 100644 --- 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 aaeae03..1b25a1e 100644 --- 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. -- 2.25.1