no proxy for local mirrors

This commit is contained in:
Alexander Weidinger 2018-04-27 22:27:40 +02:00
parent f3345b1f66
commit 2c45451157
3 changed files with 10 additions and 0 deletions

View file

@ -1,3 +1,6 @@
{% 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::http::Proxy "http://{{ apt_cacher_ng.server_address }}:{{ apt_cacher_ng.server_port }}";
Acquire::https::Proxy "{{ apt_cacher_ng.https_proxy }}"; Acquire::https::Proxy "{{ apt_cacher_ng.https_proxy }}";
{% for host in apt_cacher_ng.local_mirrors -%}
Acquire::http::Proxy::{{ host }} "DIRECT";
{% endfor -%}

View file

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

View file

@ -36,6 +36,12 @@ apt_cacher_ng:
# Default value ignores proxy for HTTPS connections # Default value ignores proxy for HTTPS connections
https_proxy: DIRECT https_proxy: DIRECT
# Local mirrors don't need a proxy
# See https://linux.die.net/man/5/apt.conf
local_mirrors:
- 192.168.0.1
- host.example.test
## ##
# require/require_in/include example # require/require_in/include example