From 85c1e0a82fe8a2a5fd49312465a57f7922277d64 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 21 Dec 2017 07:18:45 +0000
Subject: [PATCH] web proxy: tweak previous

We can't fix reconfigure, but at least we can split up restart
to be an explicit stop start to push 'squid -z -N' into the middle.

PR: https://github.com/opnsense/core/issues/2008
---
 src/etc/inc/plugins.inc.d/squid.inc                    | 1 +
 src/opnsense/service/conf/actions.d/actions_proxy.conf | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/squid.inc b/src/etc/inc/plugins.inc.d/squid.inc
index 801947cb5..da45c82b3 100644
--- a/src/etc/inc/plugins.inc.d/squid.inc
+++ b/src/etc/inc/plugins.inc.d/squid.inc
@@ -40,6 +40,7 @@ function squid_services()
                 'start' => array('proxy start'),
                 'stop' => array('proxy stop'),
             ),
+            'pid' => '/var/run/squid/squid.pid',
             'name' => 'squid',
         );
     }
diff --git a/src/opnsense/service/conf/actions.d/actions_proxy.conf b/src/opnsense/service/conf/actions.d/actions_proxy.conf
index 0c339da73..38e48f1b6 100644
--- a/src/opnsense/service/conf/actions.d/actions_proxy.conf
+++ b/src/opnsense/service/conf/actions.d/actions_proxy.conf
@@ -19,16 +19,16 @@ message:stopping proxy
 
 [restart]
 command:
-    /usr/local/opnsense/scripts/proxy/setup.sh;
     /usr/local/etc/rc.plugins_configure webproxy restart;
-    /usr/local/etc/rc.d/squid restart
+    /usr/local/etc/rc.d/squid stop;
+    /usr/local/opnsense/scripts/proxy/setup.sh;
+    /usr/local/etc/rc.d/squid start
 parameters:
 type:script
 message:restarting proxy
 
 [reconfigure]
 command:
-    /usr/local/opnsense/scripts/proxy/setup.sh;
     /usr/local/etc/rc.plugins_configure webproxy reconfigure;
     /usr/local/etc/rc.d/squid reload
 parameters: