diff --git a/apt-cacher/ng/files/client.conf b/apt-cacher/ng/files/client.conf index 9fa0e8d..7e52d68 100644 --- a/apt-cacher/ng/files/client.conf +++ b/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 }}"; diff --git a/apt-cacher/ng/map.jinja b/apt-cacher/ng/map.jinja index 0362316..8dde861 100644 --- a/apt-cacher/ng/map.jinja +++ b/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')) %} diff --git a/pillar.example b/pillar.example index 62cd5eb..38a98e8 100644 --- a/pillar.example +++ b/pillar.example @@ -29,3 +29,9 @@ apt_cacher_ng: # http://:/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