From f1b499afe62da9b7f8f94ef1accbdc4bfab812f3 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 3 Jan 2018 07:42:41 +0100 Subject: [PATCH] www/web-proxy-useracl: merge cleanups from master --- www/web-proxy-useracl/+POST_INSTALL.post | 2 +- .../src/etc/inc/plugins.inc.d/proxy_useracl.inc | 2 +- .../OPNsense/ProxyUserACL/{reconfigure.php => reload.php} | 0 .../service/conf/actions.d/actions_proxyuseracl.conf | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) rename www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/{reconfigure.php => reload.php} (100%) diff --git a/www/web-proxy-useracl/+POST_INSTALL.post b/www/web-proxy-useracl/+POST_INSTALL.post index f8c690fdd..06c3c6c22 100644 --- a/www/web-proxy-useracl/+POST_INSTALL.post +++ b/www/web-proxy-useracl/+POST_INSTALL.post @@ -1,4 +1,4 @@ -/usr/local/opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php +/usr/local/opnsense/scripts/OPNsense/ProxyUserACL/reload.php if [ -f /var/run/squid/squid.pid ]; then service squid reload fi diff --git a/www/web-proxy-useracl/src/etc/inc/plugins.inc.d/proxy_useracl.inc b/www/web-proxy-useracl/src/etc/inc/plugins.inc.d/proxy_useracl.inc index 4f145e629..91bac7a81 100644 --- a/www/web-proxy-useracl/src/etc/inc/plugins.inc.d/proxy_useracl.inc +++ b/www/web-proxy-useracl/src/etc/inc/plugins.inc.d/proxy_useracl.inc @@ -38,5 +38,5 @@ function proxy_useracl_configure() function proxy_useracl_squid_hook() { configd_run('template reload OPNsense/ProxyUserACL'); - configd_run('proxyuseracl reconfigure'); + configd_run('proxyuseracl reload'); } diff --git a/www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php b/www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/reload.php similarity index 100% rename from www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php rename to www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/reload.php diff --git a/www/web-proxy-useracl/src/opnsense/service/conf/actions.d/actions_proxyuseracl.conf b/www/web-proxy-useracl/src/opnsense/service/conf/actions.d/actions_proxyuseracl.conf index cd4219fc0..2cddc83b8 100644 --- a/www/web-proxy-useracl/src/opnsense/service/conf/actions.d/actions_proxyuseracl.conf +++ b/www/web-proxy-useracl/src/opnsense/service/conf/actions.d/actions_proxyuseracl.conf @@ -1,5 +1,5 @@ -[reconfigure] -command:/usr/local/opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php +[reload] +command:/usr/local/opnsense/scripts/OPNsense/ProxyUserACL/reload.php parameters: type:script -message:reconfigure proxy +message:reload web proxy user acl