-
Notifications
You must be signed in to change notification settings - Fork 21
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
webproxy: T3671: Fix paths from squid3 to squid #17
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My only immediate objection is that we should be using systemctl
for restarting services, not legacy SysV init scripts.
There are also quite a few mentions of the long-gone "vyattaguard". But I think there are more, so we should probably make a separate task for it.
Also, the amount of duplicated code makes me wonder if we should consolidate clear and restart scripts into a single script.
scripts/vyatta-clear-squid
Outdated
|
||
if test -n "$PID"; then | ||
/etc/init.d/squid3 stop | ||
/etc/init.d/squid stop | ||
if cli-shell-api existsActive service webproxy url-filtering \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
VyattaGuard was a squidguard version with proprietary rules, as far as I remember. In any case it's no longer relevant.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I delete it.
c47091a
to
52a0626
Compare
The initial configuration works fine. Also after reboot, the service works.
I found some problem when we re-add configuration for webproxy, I can't commit it.
This commit hangs forever.
A similar bug was described in https://phabricator.vyos.net/T1770 Update. The reason for the commit hangs it trying to update squidguard db, but it is not configured.
|
In original pkg squid a paths was changed from squid3 to squid. This fixes changing all mentioned squid3 to squid.
In the original pkg squid a paths was changed from squid3 to squid.
This fixes changing all mentioned squid3 to squid.
https://phabricator.vyos.net/T3671
Webproxy in 1.2.8 can't start without this change
Tested configuration
Check processes