diff --git a/salt/manager/files/acng/acng.conf b/salt/manager/files/acng/acng.conf index df934643b..55a46e616 100644 --- a/salt/manager/files/acng/acng.conf +++ b/salt/manager/files/acng/acng.conf @@ -91,6 +91,6 @@ PassThroughPattern: (repo\.securityonion\.net:443|download\.docker\.com:443|mirr # MaxInresponsiveDlSize: 64000 # BadRedirDetectMime: text/html {% set proxy = salt['pillar.get']('manager:proxy') -%} -{{ if proxy }} +{% if proxy %} Proxy: {{ proxy }} -{{ endif }} +{% endif %} diff --git a/salt/manager/init.sls b/salt/manager/init.sls index 1d21c95d3..91635eb59 100644 --- a/salt/manager/init.sls +++ b/salt/manager/init.sls @@ -61,6 +61,8 @@ acngcopyconf: file.managed: - name: /opt/so/conf/aptcacher-ng/etc/acng.conf - source: salt://manager/files/acng/acng.conf + - template: jinja + - show_changes: False # Install the apt-cacher-ng container so-aptcacherng: diff --git a/salt/repo/client/init.sls b/salt/repo/client/init.sls index 5567caac2..cff28fb4a 100644 --- a/salt/repo/client/init.sls +++ b/salt/repo/client/init.sls @@ -63,6 +63,7 @@ yumconf: - source: salt://repo/client/files/centos/yum.conf.jinja - mode: 644 - template: jinja + - show_changes: False {% endif %} cleanyum: