From 318b8744e7c7ea21bbc864df8da06a18b1ac8bf1 Mon Sep 17 00:00:00 2001 From: Alexander Shursha Date: Thu, 22 Mar 2018 09:58:46 +0300 Subject: [PATCH] Add verbose output. --- .../src/etc/inc/plugins.inc.d/proxy_sso.inc | 9 +++++++-- .../src/etc/inc/plugins.inc.d/proxy_useracl.inc | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/www/web-proxy-sso/src/etc/inc/plugins.inc.d/proxy_sso.inc b/www/web-proxy-sso/src/etc/inc/plugins.inc.d/proxy_sso.inc index 643bddeb8..cfe9efaaf 100644 --- a/www/web-proxy-sso/src/etc/inc/plugins.inc.d/proxy_sso.inc +++ b/www/web-proxy-sso/src/etc/inc/plugins.inc.d/proxy_sso.inc @@ -9,8 +9,13 @@ function proxy_sso_configure() function proxy_sso_squid_hook($verbose, $action) { - if ($action == "reconfigure") { - configd_run('template reload OPNsense/ProxySSO'); + if (!in_array($action, ['restart', 'reload', 'start', 'stop'])) { + exit; + } + + $res = configd_run('template reload OPNsense/ProxySSO'); + if ($verbose) { + printf("template reload OPNsense/ProxySSO: %s\n", trim($res)); } } 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 93b258299..e8ef1faf9 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 @@ -35,10 +35,20 @@ function proxy_useracl_configure() ]; } -function proxy_useracl_squid_hook() +function proxy_useracl_squid_hook($verbose, $action) { - configd_run('template reload OPNsense/ProxyUserACL'); - configd_run('proxyuseracl reload'); + if (!in_array($action, ['restart', 'reload', 'start', 'stop'])) { + exit; + } + + $res = configd_run('template reload OPNsense/ProxyUserACL'); + if ($verbose) { + printf("template reload OPNsense/ProxyUserACL: %s\n", trim($res)); + } + $res = configd_run('proxyuseracl reload'); + if ($verbose) { + printf("proxyuseracl reload: %s\n", trim($res)); + } } function proxy_useracl_xmlrpc_sync()