From 670acbe61d37b0f5ff9288e2c206cfd030f13bb7 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 28 Nov 2017 20:48:41 +0000 Subject: [PATCH] security/acme-client: sync service start PR: https://github.com/opnsense/core/issues/1954 --- .../OPNsense/AcmeClient/AccountsController.php | 1 - .../controllers/OPNsense/AcmeClient/ActionsController.php | 1 - .../OPNsense/AcmeClient/Api/ServiceController.php | 8 +++++++- .../OPNsense/AcmeClient/CertificatesController.php | 1 - .../controllers/OPNsense/AcmeClient/IndexController.php | 2 -- .../OPNsense/AcmeClient/ValidationsController.php | 1 - 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php index f4ccf8a65..2000717b7 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php @@ -37,7 +37,6 @@ class AccountsController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = "Let's Encrypt Accounts"; // include form definitions $this->view->formDialogAccount = $this->getForm("dialogAccount"); // choose template diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php index 512accd09..6e7ef04dc 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php @@ -37,7 +37,6 @@ class ActionsController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = "Let's Encrypt Restart Actions"; // include form definitions $this->view->formDialogAction = $this->getForm("dialogAction"); // choose template diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php index 419d5d9eb..f064d0445 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php @@ -48,8 +48,10 @@ class ServiceController extends ApiControllerBase public function startAction() { if ($this->request->isPost()) { + // close session for long running action + $this->sessionClose(); $backend = new Backend(); - $response = $backend->configdRun("acmeclient http-start", true); + $response = $backend->configdRun("acmeclient http-start"); return array("response" => $response); } else { return array("response" => array()); @@ -63,6 +65,8 @@ class ServiceController extends ApiControllerBase public function stopAction() { if ($this->request->isPost()) { + // close session for long running action + $this->sessionClose(); $backend = new Backend(); $response = $backend->configdRun("acmeclient http-stop"); return array("response" => $response); @@ -78,6 +82,8 @@ class ServiceController extends ApiControllerBase public function restartAction() { if ($this->request->isPost()) { + // close session for long running action + $this->sessionClose(); $backend = new Backend(); $response = $backend->configdRun("acmeclient http-restart"); return array("response" => $response); diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php index 86640f1d1..d0c290720 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php @@ -37,7 +37,6 @@ class CertificatesController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = "Let's Encrypt Certificates"; // include form definitions $this->view->formDialogCertificate = $this->getForm("dialogCertificate"); // choose template diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php index d6de7cf4a..77f3f883d 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php @@ -41,8 +41,6 @@ class IndexController extends \OPNsense\Base\IndexController */ public function indexAction() { - // set page title - $this->view->title = "Let's Encrypt Settings"; // include form definitions $this->view->settingsForm = $this->getForm("settings"); // pick the template to serve diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php index bf1cb3d96..968c88070 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php @@ -37,7 +37,6 @@ class ValidationsController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = "Let's Encrypt Domain Validation Methods"; // include form definitions $this->view->formDialogValidation = $this->getForm("dialogValidation"); // choose template