Linux-Help/formula-apt-cacher
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

adding ability to enable/disable https apt repositories

Browse source
This commit is contained in:
Freddy Andersen 2017-01-23 07:36:11 -08:00
parent 03d82da02d
commit f7b957bf5e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apt-cacher/ng/files/client.conf
View file

@ -1,2 +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::http::Proxy "http://{{ apt_cacher_ng.server_address }}:{{ apt_cacher_ng.server_port }}";
Acquire::http::Proxy "{{ apt_cacher_ng.https_proxy_enabled }}";

3
apt-cacher/ng/map.jinja
View file

@ -14,6 +14,7 @@
'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',
'admin_account': 'root', 'admin_account': 'root',
'admin_passwd': 'admin' 'admin_passwd': 'admin',
'https_proxy_enabled': 'false'
}, },
}, merge=salt['pillar.get']('apt_cacher_ng')) %} }, merge=salt['pillar.get']('apt_cacher_ng')) %}