lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

web proxy: backend reconfigure is a reload

Browse Source 
PR: https://github.com/opnsense/plugins/issues/454
This commit is contained in:
Franco Fichtner 2018-01-01 12:07:09 +01:00
parent 8f706cb62b
commit 369a5e40fe
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php
View File

@ -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');
}
}

8
src/opnsense/service/conf/actions.d/actions_proxy.conf
View File

@ -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: