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

web proxy: move plugin reloads to backend directly

Browse Source 
This avoids double-bouncing.  ConfigParser allows header continuation,
something we've discussed briefly during the SSO plugin review.  In this
style, the scripting becomes more obvious.
This commit is contained in:
Franco Fichtner 2017-09-23 16:26:28 +02:00
parent 6566213c42
commit 107632b082
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php
View File

@ -46,8 +46,6 @@ class ServiceController extends ApiControllerBase
{
if ($this->request->isPost()) {
$backend = new Backend();
/* XXX why don't we run this from the backend directly? */
$backend->configdRun('plugins webproxy start');
$response = $backend->configdRun("proxy start", true);
return array("response" => $response);
} else {
@ -64,8 +62,6 @@ class ServiceController extends ApiControllerBase
if ($this->request->isPost()) {
$backend = new Backend();
$response = $backend->configdRun("proxy stop");
/* XXX why don't we run this from the backend directly? */
$backend->configdRun('plugins webproxy stop');
return array("response" => $response);
} else {
return array("response" => array());
@ -80,8 +76,6 @@ class ServiceController extends ApiControllerBase
{
if ($this->request->isPost()) {
$backend = new Backend();
/* XXX why don't we run this from the backend directly? */
$backend->configdRun('plugins webproxy restart');
$response = $backend->configdRun("proxy restart");
return array("response" => $response);
} else {
@ -156,8 +150,6 @@ class ServiceController extends ApiControllerBase
// (res)start daemon
if ($mdlProxy->general->enabled->__toString() == 1) {
if ($runStatus['status'] == "running" && !$force_restart) {
/* XXX why don't we run this from the backend directly? */
$backend->configdRun('plugins webproxy reconfigure');
$backend->configdRun("proxy reconfigure");
} else {
$this->startAction();

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

@ -1,23 +1,34 @@
[start]
command:/usr/local/opnsense/scripts/proxy/setup.sh;/usr/local/etc/rc.d/squid start
command:
/usr/local/opnsense/scripts/proxy/setup.sh;
/usr/local/etc/rc.plugins_configure webproxy start;
/usr/local/etc/rc.d/squid start
parameters:
type:script
message:starting proxy
[stop]
command:/usr/local/etc/rc.d/squid stop;/usr/bin/killall squid;exit 0
command:
/usr/local/etc/rc.d/squid stop;
/usr/bin/killall squid;
/usr/local/etc/rc.plugins_configure webproxy stop;
exit 0
parameters:
type:script
message:stopping proxy
[restart]
command:/usr/local/etc/rc.d/squid restart
command:
/usr/local/etc/rc.plugins_configure webproxy restart;
/usr/local/etc/rc.d/squid restart
parameters:
type:script
message:restarting proxy
[reconfigure]
command:/usr/local/etc/rc.d/squid reload
command:
/usr/local/etc/rc.plugins_configure webproxy reconfigure;
/usr/local/etc/rc.d/squid reload
parameters:
type:script
message:reconfigure proxy
@ -29,7 +40,11 @@ type:script_output
message:request proxy status
[fetchacls]
command:/usr/local/opnsense/scripts/proxy/fetchACLs.py&&/usr/local/etc/rc.d/squid reload
command:
/usr/local/opnsense/scripts/proxy/fetchACLs.py && (
/usr/local/etc/rc.plugins_configure webproxy reconfigure;
/usr/local/etc/rc.d/squid reload
)
parameters:
type:script
message:download and reload proxy ACLs from remote locations