From 369a5e40fe278d2ab62f56f3a7c6cb2e5cd18382 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 1 Jan 2018 12:07:09 +0100
Subject: [PATCH] web proxy: backend reconfigure is a reload

PR: https://github.com/opnsense/plugins/issues/454
---
 .../OPNsense/Base/ApiMutableServiceControllerBase.php     | 6 +++---
 src/opnsense/service/conf/actions.d/actions_proxy.conf    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php
index dea4b5b7a..8cafe703f 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2017 Franco Fichtner <franco@opnsense.org>
+ * Copyright (C) 2017-2018 Franco Fichtner <franco@opnsense.org>
  * Copyright (C) 2016 IT-assistans Sverige AB
  * Copyright (C) 2015-2016 Deciso B.V.
  * All rights reserved.
@@ -155,7 +155,7 @@ abstract class ApiMutableServiceControllerBase extends ApiControllerBase
     }
 
     /**
-     * reconfigure, generate config and reload
+     * reconfigure with opional stop, generate config and start / reload
      */
     public function reconfigureAction()
     {
@@ -177,7 +177,7 @@ abstract class ApiMutableServiceControllerBase extends ApiControllerBase
                 if ($runStatus['status'] != 'running') {
                     $backend->configdRun(escapeshellarg(static::$internalServiceName) . ' start');
                 } else {
-                    $backend->configdRun(escapeshellarg(static::$internalServiceName) . ' reconfigure');
+                    $backend->configdRun(escapeshellarg(static::$internalServiceName) . ' reload');
                 }
             }
 
diff --git a/src/opnsense/service/conf/actions.d/actions_proxy.conf b/src/opnsense/service/conf/actions.d/actions_proxy.conf
index 2573e2b4f..7f05bf6c7 100644
--- a/src/opnsense/service/conf/actions.d/actions_proxy.conf
+++ b/src/opnsense/service/conf/actions.d/actions_proxy.conf
@@ -26,13 +26,13 @@ parameters:
 type:script
 message:restarting proxy
 
-[reconfigure]
+[reload]
 command:
-    /usr/local/etc/rc.plugins_configure webproxy reconfigure;
+    /usr/local/etc/rc.plugins_configure webproxy reload;
     /usr/local/etc/rc.d/squid reload
 parameters:
 type:script
-message:reconfigure proxy
+message:reload proxy
 
 [status]
 command:/usr/local/etc/rc.d/squid status;exit 0
@@ -43,7 +43,7 @@ message:request proxy status
 [fetchacls]
 command:
     /usr/local/opnsense/scripts/proxy/fetchACLs.py && (
-        /usr/local/etc/rc.plugins_configure webproxy reconfigure;
+        /usr/local/etc/rc.plugins_configure webproxy reload;
         /usr/local/etc/rc.d/squid reload
     )
 parameters: