From 63951bcb8e92e18f19911bf53e01cd5f5031057f Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 23 Jan 2019 16:21:24 +0100 Subject: [PATCH] Tell apt to use cartel CAs for https mirrors --- modules/debian_org/files/apt.conf.d/local-cainfo | 7 +++++++ modules/debian_org/files/misc/hoster.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 modules/debian_org/files/apt.conf.d/local-cainfo 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 index 000000000..7bf3b0a58 --- /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 c51718919..7cb1e238b 100644 --- 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: -- 2.20.1