From f7b957bf5e97a708ebb5fe6356f69403c43f5cde Mon Sep 17 00:00:00 2001 From: Freddy Andersen Date: Mon, 23 Jan 2017 07:36:11 -0800 Subject: [PATCH 1/2] adding ability to enable/disable https apt repositories --- apt-cacher/ng/files/client.conf | 3 ++- apt-cacher/ng/map.jinja | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apt-cacher/ng/files/client.conf b/apt-cacher/ng/files/client.conf index 91152cc..70ce331 100644 --- a/apt-cacher/ng/files/client.conf +++ b/apt-cacher/ng/files/client.conf @@ -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 "{{ apt_cacher_ng.https_proxy_enabled }}"; diff --git a/apt-cacher/ng/map.jinja b/apt-cacher/ng/map.jinja index aea97a6..2179fdd 100644 --- a/apt-cacher/ng/map.jinja +++ b/apt-cacher/ng/map.jinja @@ -14,6 +14,7 @@ 'credentials': '/etc/apt-cacher-ng/security.conf', 'client_config': '/etc/apt/apt.conf.d/80proxy', 'admin_account': 'root', - 'admin_passwd': 'admin' + 'admin_passwd': 'admin', + 'https_proxy_enabled': 'false' }, }, merge=salt['pillar.get']('apt_cacher_ng')) %} From 15d4be98061022835a7069433912273be9f7bef9 Mon Sep 17 00:00:00 2001 From: Freddy Andersen Date: Mon, 23 Jan 2017 07:53:20 -0800 Subject: [PATCH 2/2] typo --- apt-cacher/ng/files/client.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-cacher/ng/files/client.conf b/apt-cacher/ng/files/client.conf index 70ce331..e52a98c 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 -%} Acquire::http::Proxy "http://{{ apt_cacher_ng.server_address }}:{{ apt_cacher_ng.server_port }}"; -Acquire::http::Proxy "{{ apt_cacher_ng.https_proxy_enabled }}"; +Acquire::https::Proxy "{{ apt_cacher_ng.https_proxy_enabled }}";