Skip to content
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.

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

Squid plugins #1328

Merged
merged 2 commits into from
Jan 25, 2017
Merged

Squid plugins #1328

merged 2 commits into from
Jan 25, 2017

Conversation

evbevz
Copy link
Member

@evbevz evbevz commented Jan 6, 2017

Includes moved to right places.
Auth plugins include added.

@AdSchellevis AdSchellevis self-assigned this Jan 6, 2017
@AdSchellevis AdSchellevis added the cleanup Low impact changes label Jan 6, 2017
@@ -258,10 +258,14 @@ icap_enable off
{% include ['OPNsense/Proxy/squid.user.alt_auth.conf', 'OPNsense/Proxy/squid.user.local_auth.conf'] %}
{% endif %}

# Pre-auth plugins
include /usr/local/etc/squid/pre-auth/*.conf
{% include "OPNsense/Proxy/squid.user.pre_auth.conf" ignore missing with context %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this should be removed, @AdSchellevis ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fichtner I will do this after inspection of the plugins

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

{% include "OPNsense/Proxy/squid.user.pre_auth.conf" ignore missing with context %}

{% include "OPNsense/Proxy/squid.acl.conf" ignore missing with context %}

# Post-auth plugins
include /usr/local/etc/squid/post-auth/*.conf
{% include "OPNsense/Proxy/squid.user.post_auth.conf" ignore missing with context %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this too

@AdSchellevis AdSchellevis added this to the 17.1 milestone Jan 25, 2017
@AdSchellevis AdSchellevis merged commit 1172382 into opnsense:master Jan 25, 2017
AdSchellevis added a commit that referenced this pull request Jan 25, 2017
fichtner pushed a commit that referenced this pull request Jan 27, 2017
PR: #1328

(cherry picked from commit 2dac5fd)
(cherry picked from commit 6b14bb2)
(cherry picked from commit b376646)
@evbevz evbevz deleted the squid-plugins branch July 27, 2017 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cleanup Low impact changes
Development

Successfully merging this pull request may close these issues.

3 participants