Tell apt to use cartel CAs for https mirrors

diff --git a/modules/debian_org/files/apt.conf.d/local-cainfo b/modules/debian_org/files/apt.conf.d/local-cainfo
new file mode 100644 (file)
index 0000000..7bf3b0a
--- /dev/null
+++ b/modules/debian_org/files/apt.conf.d/local-cainfo
@@ -0,0 +1,7 @@
+//
+// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+// USE: git clone git+ssh://git@ubergit.debian.org/dsa/dsa-puppet.git
+//
+Acquire::https::mirror.bytemark.co.uk::CAInfo "/etc/ssl/ca-global/ca-certificates.crt";
+Acquire::https::mirrors.wikimedia.org::CAInfo "/etc/ssl/ca-global/ca-certificates.crt";
+Acquire::https::mirror.netcologne.de::CAInfo "/etc/ssl/ca-global/ca-certificates.crt";

diff --git a/modules/debian_org/files/misc/hoster.yaml b/modules/debian_org/files/misc/hoster.yaml
index c517189..7cb1e23 100644 (file)
--- a/modules/debian_org/files/misc/hoster.yaml
+++ b/modules/debian_org/files/misc/hoster.yaml
@@ -155,6 +155,6 @@ ynic:
 zivit:
   netrange:
     - 80.245.144.0/22
-  mirror-debian: https://debian.netcologne.de/debian/
+  mirror-debian: https://mirror.netcologne.de/debian/
 
 # vim:set et sts=2 ts=2 sw=2: