Skip to content

Optimized configuration mapping #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ukretschmer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Optimized configuration mapping #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8395d9d
Using base parameter of grains.filter_by enables less reduntant confi…
ukretschmer Dec 16, 2016
64f2437
Moving default values of allowed_src, safe_ports and http_port to map…
ukretschmer Dec 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions squid/files/squid.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Example rule allowing access from your local networks.
# Adapt to list your (internal) IP networks from where browsing
# should be allowed
{%- for src in cfg_squid.get('allowed_src', ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16', 'fc00::/7', 'fe80::/10']) %}
{%- for src in cfg_squid.get('allowed_src', map.allowed_src) %}
acl localnet src {{ src }}
{%- endfor %}

Expand All @@ -22,7 +22,7 @@ acl manager url_regex -i ^cache_object:// /squid-internal-mgr/

acl SSL_ports port 443

{%- for port in cfg_squid.get('safe_ports', ['80', '21', '443', '70', '210', '1025-65535', '280', '488', '591', '777']) %}
{%- for port in cfg_squid.get('safe_ports', map.safe_ports) %}
acl Safe_ports port {{ port }}
{%- endfor %}

Expand Down Expand Up @@ -108,7 +108,7 @@ http_access {{rule}}
http_access deny all

# Squid normally listens to port 3128
{%- for http_port in cfg_squid.get('http_port', ['3128']) %}
{%- for http_port in cfg_squid.get('http_port', map.http_port) %}
http_port {{http_port}}
{%- endfor %}

Expand Down
12 changes: 6 additions & 6 deletions squid/map.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{# All default values are defined in the 'Ubuntu' section. It is set as base, therefor only
different values has to be set for other operating systems. This lowers configuration redundancy. #}
{% set map = salt['grains.filter_by']({
'Ubuntu': {
'pkgs': ['squid'],
'service': 'squid',
'conf_dir': '/etc/squid',
'conf_file': 'squid.conf',
'cache': '/var/spool/squid',
'allowed_src': ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16', 'fc00::/7', 'fe80::/10'],
'safe_ports': ['80', '21', '443', '70', '210', '1025-65535', '280', '488', '591', '777'],
'http_port': ['3128'],
},
'Debian': {
'pkgs': ['squid3'],
'service': 'squid3',
'conf_dir': '/etc/squid3',
'conf_file': 'squid.conf',
'cache': '/var/spool/squid',
},
'FreeBSD': {
'pkgs': ['squid'],
'service': 'squid',
'conf_dir': '/usr/local/etc/squid',
'conf_file': 'squid.conf',
'cache': '/var/squid/cache',
},
}, grain='os', merge=salt['pillar.get']('squid:lookup')) %}
}, grain='os', merge=salt['pillar.get']('squid:lookup'), base='Ubuntu') %}