From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 20 Sep 2024 19:25:47 +0000 (-0600)
Subject: Don't use Apt Cacher NG with https repositories.
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=d04a3abef19e6aec81df8fac71525100f04a559d;p=Network

Don't use Apt Cacher NG with https repositories.

Connect directly.  Cache locally.  Only Jellyfin makes us do this,
currently.
---

diff --git a/README.org b/README.org
index f582acc..886b9ea 100644
--- a/README.org
+++ b/README.org
@@ -968,7 +968,9 @@ The abbey uses the Apt-Cacher:TNG package cache on Core.  The
 
 ** Use Cloister Apt Cache
 
-Core itself will benefit from using the package cache.
+Core itself will benefit from using the package cache, but should
+contact ~https~ repositories directly.  (There are few such cretins
+so caching their packages is not a priority.)
 
 #+CAPTION: [[file:roles_t/abbey-core/tasks/main.yml][=roles_t/abbey-core/tasks/main.yml=]]
 #+BEGIN_SRC conf :tangle roles_t/abbey-core/tasks/main.yml
@@ -979,6 +981,8 @@ Core itself will benefit from using the package cache.
     content: >
       Acquire::http::Proxy
       "http://apt-cacher.birchwood.private.:3142";
+
+      Acquire::https::Proxy "DIRECT";
     dest: /etc/apt/apt.conf.d/01proxy
     mode: u=rw,g=r,o=r
 #+END_SRC
@@ -1684,6 +1688,9 @@ repeatedly until few or no incomplete or damaged files are found.
 Depending on the quality of the Internet connection, this may take a
 while.
 
+Again, ~https~ repositories are contacted directly, cached only on the
+local host.
+
 #+CAPTION: [[file:roles_t/abbey-cloister/tasks/main.yml][=roles_t/abbey-cloister/tasks/main.yml=]]
 #+BEGIN_SRC conf :tangle roles_t/abbey-cloister/tasks/main.yml :mkdirp yes
 ---
@@ -1693,6 +1700,8 @@ while.
     content: >
       Acquire::http::Proxy
       "http://apt-cacher.birchwood.private.:3142";
+
+      Acquire::https::Proxy "DIRECT";
     dest: /etc/apt/apt.conf.d/01proxy
     mode: u=rw,g=r,o=r
 #+END_SRC
diff --git a/roles_t/abbey-cloister/tasks/main.yml b/roles_t/abbey-cloister/tasks/main.yml
index 6b499ee..d4b064b 100644
--- a/roles_t/abbey-cloister/tasks/main.yml
+++ b/roles_t/abbey-cloister/tasks/main.yml
@@ -5,6 +5,8 @@
     content: >
       Acquire::http::Proxy
       "http://apt-cacher.birchwood.private.:3142";
+
+      Acquire::https::Proxy "DIRECT";
     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 8930b1a..c9921b9 100644
--- a/roles_t/abbey-core/tasks/main.yml
+++ b/roles_t/abbey-core/tasks/main.yml
@@ -182,6 +182,8 @@
     content: >
       Acquire::http::Proxy
       "http://apt-cacher.birchwood.private.:3142";
+
+      Acquire::https::Proxy "DIRECT";
     dest: /etc/apt/apt.conf.d/01proxy
     mode: u=rw,g=r,o=r