Merge Institute and remove domain_priv from public/vars.yml.

diff --git a/Institute b/Institute
index a7115f9276de88e0bc3397f9300e9a7deec7a829..59702491f27786ab82b574aec454cbb44fb17c1e 160000 (submodule)
--- a/Institute
+++ b/Institute
@@ -1 +1 @@
-Subproject commit a7115f9276de88e0bc3397f9300e9a7deec7a829
+Subproject commit 59702491f27786ab82b574aec454cbb44fb17c1e

diff --git a/README.org b/README.org
index 15398aff5d2758a9284a8a5c2a4885580cabcaf0..fcf8298983bdca7746a8b597c0618cf62349e5a8 100644 (file)
--- 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 ed02b8a1e23d1a15b1b55da2122f693b8cad5bb2..ca2a363ea10eb8ed815781697af738db859d760c 100644 (file)
--- 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 6eafa5fa5af22aeac61967965d929febc7a2b791..eb9fcce337234359f1c34782b3b816cb855ce31a 100644 (file)
--- 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