Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: saltstack-formulas/squid-formula
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Peter0x48/squid-formula
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 19, 2017

  1. Removed 'local' ips

    @Peter0x48
    Peter0x48 committed Dec 19, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    69695d1 View commit details

  2. Update

    @Peter0x48
    Peter0x48 committed Dec 19, 2017
    Copy the full SHA
    3b850f1 View commit details

  3. Update

    @Peter0x48
    Peter0x48 committed Dec 19, 2017
    Copy the full SHA
    77271b3 View commit details
Showing with 2 additions and 14 deletions.
  1. +2 −14 squid/files/squid.conf
16 changes: 2 additions & 14 deletions squid/files/squid.conf
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,8 @@
# Recommended minimum configuration:
#

# 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']) %}
acl localnet src {{ src }}
{%- endfor %}
#http://www.squid-cache.org/Doc/config/shutdown_lifetime/
shutdown_lifetime 1 seconds

{%- if cfg_squid.get('deprecated_localhost_acl', False) %}
acl localhost src 127.0.0.1
@@ -62,14 +58,6 @@ http_access deny manager
#
# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
#
{% if example_rule %}
# Example rule allowing access from your local networks.
# Adapt localnet in the ACL section to list your (internal) IP networks
# from where browsing should be allowed
http_access allow localnet
http_access allow localhost
{% endif %}

{%- for acl, ports in cfg_squid.get('port_acl', {}).items() %}
{%- for port in ports %}
acl {{acl}} port {{port}}