From 4cd04003b22f5898f3437fa8f50bc8a07bcfc99b Mon Sep 17 00:00:00 2001
From: Alexander Shursha <kekek2@ya.ru>
Date: Tue, 19 Sep 2017 21:48:59 +0300
Subject: [PATCH] Add plugins_reconfigure to squid (#1627)

---
 .../controllers/OPNsense/Proxy/Api/ServiceController.php | 4 ++++
 src/opnsense/scripts/OPNsense/Proxy/plugins.php          | 9 +++++++++
 src/opnsense/service/conf/actions.d/actions_proxy.conf   | 7 +++++++
 3 files changed, 20 insertions(+)
 create mode 100755 src/opnsense/scripts/OPNsense/Proxy/plugins.php

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php
index 97d70de82..a9f8cbb9b 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php
@@ -46,6 +46,7 @@ class ServiceController extends ApiControllerBase
     {
         if ($this->request->isPost()) {
             $backend = new Backend();
+            $backend->configdRun('proxy plugins start');
             $response = $backend->configdRun("proxy start", true);
             return array("response" => $response);
         } else {
@@ -61,6 +62,7 @@ class ServiceController extends ApiControllerBase
     {
         if ($this->request->isPost()) {
             $backend = new Backend();
+            $backend->configdRun('proxy plugins stop');
             $response = $backend->configdRun("proxy stop");
             return array("response" => $response);
         } else {
@@ -76,6 +78,7 @@ class ServiceController extends ApiControllerBase
     {
         if ($this->request->isPost()) {
             $backend = new Backend();
+            $backend->configdRun('proxy plugins restart');
             $response = $backend->configdRun("proxy restart");
             return array("response" => $response);
         } else {
@@ -146,6 +149,7 @@ class ServiceController extends ApiControllerBase
 
             // generate template
             $backend->configdRun('template reload OPNsense/Proxy');
+            $backend->configdRun('proxy plugins reconfigure');
 
             // (res)start daemon
             if ($mdlProxy->general->enabled->__toString() == 1) {
diff --git a/src/opnsense/scripts/OPNsense/Proxy/plugins.php b/src/opnsense/scripts/OPNsense/Proxy/plugins.php
new file mode 100755
index 000000000..e75f99664
--- /dev/null
+++ b/src/opnsense/scripts/OPNsense/Proxy/plugins.php
@@ -0,0 +1,9 @@
+#!/usr/local/bin/php
+<?php
+
+require_once("config.inc");
+require_once("plugins.inc");
+
+if (isset($argv[1])) {
+    plugins_configure("webproxy_" . trim($argv[1], " \n"));
+}
diff --git a/src/opnsense/service/conf/actions.d/actions_proxy.conf b/src/opnsense/service/conf/actions.d/actions_proxy.conf
index 6525f5e2d..819d4a760 100644
--- a/src/opnsense/service/conf/actions.d/actions_proxy.conf
+++ b/src/opnsense/service/conf/actions.d/actions_proxy.conf
@@ -41,3 +41,10 @@ parameters:
 type:script
 message:download proxy ACLs from remote locations
 description:Download external proxy ACLs
+
+[plugins]
+command:/usr/local/opnsense/scripts/OPNsense/Proxy/plugins.php
+parameters:%s
+type:script
+message:run plugins for squid
+description:Run plugins for squid