CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix acng config and don't show changes when proxy string can exist in file

Browse Source
This commit is contained in:
William Wernert
2021-04-20 12:55:00 -04:00
parent bbf16d0f11
commit cd0a115ac7
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/manager/files/acng/acng.conf
View File

@@ -91,6 +91,6 @@ PassThroughPattern: (repo\.securityonion\.net:443|download\.docker\.com:443|mirr
# MaxInresponsiveDlSize: 64000 # MaxInresponsiveDlSize: 64000
# BadRedirDetectMime: text/html # BadRedirDetectMime: text/html
{% set proxy = salt['pillar.get']('manager:proxy') -%} {% set proxy = salt['pillar.get']('manager:proxy') -%}
{{ if proxy }} {% if proxy %}
Proxy: {{ proxy }} Proxy: {{ proxy }}
{{ endif }} {% endif %}

2
salt/manager/init.sls
View File

@@ -61,6 +61,8 @@ acngcopyconf:
file.managed: file.managed:
- name: /opt/so/conf/aptcacher-ng/etc/acng.conf - name: /opt/so/conf/aptcacher-ng/etc/acng.conf
- source: salt://manager/files/acng/acng.conf - source: salt://manager/files/acng/acng.conf
- template: jinja
- show_changes: False
# Install the apt-cacher-ng container # Install the apt-cacher-ng container
so-aptcacherng: so-aptcacherng:

1
salt/repo/client/init.sls
View File

@@ -63,6 +63,7 @@ yumconf:
- source: salt://repo/client/files/centos/yum.conf.jinja - source: salt://repo/client/files/centos/yum.conf.jinja
- mode: 644 - mode: 644
- template: jinja - template: jinja
- show_changes: False
{% endif %} {% endif %}
cleanyum: cleanyum: