From eaf13ebeda4e2acbd107b442d474269d69b54425 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Sat, 30 Dec 2023 14:11:19 -0700 Subject: [PATCH] Merge Institute and remove domain_priv from public/vars.yml. --- Institute | 2 +- README.org | 8 +++----- public/vars.yml | 1 - roles_t/abbey-core/tasks/main.yml | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Institute b/Institute index a7115f9..5970249 160000 --- a/Institute +++ b/Institute @@ -1 +1 @@ -Subproject commit a7115f9276de88e0bc3397f9300e9a7deec7a829 +Subproject commit 59702491f27786ab82b574aec454cbb44fb17c1e diff --git a/README.org b/README.org index 15398af..fcf8298 100644 --- a/README.org +++ b/README.org @@ -31,9 +31,8 @@ To most look like our neighbors we sit between our smart TVs and our smart refrigerators and /consciously/ play the flaccid consumer streaming Amazon and watching Blu-ray discs. This works because we have preserved a means of escape. We may not be able to hide our -entertainment choices nor even eating habits anymore, but we can -still just turn it all off and retreat into private correspondence -between Inner Citadels. +entertainment choices nor even eating habits anymore, but we can still +retreat into private correspondence between Inner Citadels. The small institute tries to look "normal" too so the abbey's network map is very similar, with differences mainly in terminology, @@ -89,7 +88,6 @@ following chapters. #+BEGIN_SRC conf :tangle public/vars.yml :mkdirp yes --- domain_name: birchwood-abbey.net -domain_priv: birchwood.private full_name: Birchwood Abbey @@ -953,7 +951,7 @@ Core itself will benefit from using the package cache. become: yes copy: content: | - Acquire::http::Proxy "http://apt-cacher.{{ domain_priv }}.:3142"; + Acquire::http::Proxy "http://apt-cacher.{{ domain_priv }}.:3142"; dest: /etc/apt/apt.conf.d/01proxy mode: u=rw,g=r,o=r #+END_SRC diff --git a/public/vars.yml b/public/vars.yml index ed02b8a..ca2a363 100644 --- a/public/vars.yml +++ b/public/vars.yml @@ -1,6 +1,5 @@ --- domain_name: birchwood-abbey.net -domain_priv: birchwood.private full_name: Birchwood Abbey diff --git a/roles_t/abbey-core/tasks/main.yml b/roles_t/abbey-core/tasks/main.yml index 6eafa5f..eb9fcce 100644 --- a/roles_t/abbey-core/tasks/main.yml +++ b/roles_t/abbey-core/tasks/main.yml @@ -184,7 +184,7 @@ become: yes copy: content: | - Acquire::http::Proxy "http://apt-cacher.{{ domain_priv }}.:3142"; + Acquire::http::Proxy "http://apt-cacher.{{ domain_priv }}.:3142"; dest: /etc/apt/apt.conf.d/01proxy mode: u=rw,g=r,o=r -- 2.25.1