Merge branch 'heimdull-master'

apt-cacher/ng/files/client.conf

@@ -1,3 +1,3 @@
-{% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context %}
+{% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context -%}
 Acquire::http::Proxy "http://{{ apt_cacher_ng.server_address }}:{{ apt_cacher_ng.server_port }}";
-Acquire::https::Proxy "DIRECT";
+Acquire::https::Proxy "{{ apt_cacher_ng.https_proxy }}";

apt-cacher/ng/map.jinja

@@ -13,5 +13,6 @@
         'service': 'apt-cacher-ng',
         'credentials': '/etc/apt-cacher-ng/security.conf',
         'client_config': '/etc/apt/apt.conf.d/80proxy',
+        'https_proxy': 'DIRECT',
     },
 }, merge=salt['pillar.get']('apt_cacher_ng')) %}

pillar.example

@@ -29,3 +29,9 @@ apt_cacher_ng:
   # http://<server_adress>:<server_port>/acng-report.html
   admin_account: root
   admin_passwd: admin
+
+  # HTTPS proxy
+  # "special keyword DIRECT meaning to use no proxies"
+  #   - https://linux.die.net/man/5/apt.conf
+  # Default value ignores proxy for HTTPS connections
+  https_proxy: DIRECT