From 99f5775a9870e3c1c548cde274de56eeef1f40da Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 28 Oct 2016 14:58:14 +0200
Subject: [PATCH] tempate slash notation adaption, better print

PR: https://github.com/opnsense/core/issues/1238
---
 Mk/plugins.mk                                                 | 2 ++
 .../controllers/OPNsense/HelloWorld/Api/ServiceController.php | 2 +-
 .../controllers/OPNsense/FtpProxy/Api/ServiceController.php   | 2 +-
 .../controllers/OPNsense/HAProxy/Api/ServiceController.php    | 4 ++--
 .../controllers/OPNsense/SSOProxyAD/Api/ServiceController.php | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index a7995266d..cfcf675ce 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -127,6 +127,8 @@ scripts-auto:
 	@if [ -d ${.CURDIR}/src/opnsense/service/templates ]; then \
 		for FILE in $$(cd ${.CURDIR}/src/opnsense/service/templates && \
 		    find -s . -mindepth 2 -type d); do \
+			echo "echo -n \"Reloading template $${FILE#./}: \"" >> \
+			    ${DESTDIR}/+POST_INSTALL; \
 			echo "/usr/local/sbin/configctl template reload $${FILE#./}" >> \
 			    ${DESTDIR}/+POST_INSTALL; \
 		done; \
diff --git a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php
index 8a63a5921..d66452ad7 100644
--- a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php
+++ b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php
@@ -45,7 +45,7 @@ class ServiceController extends ApiControllerBase
         $status = "failed";
         if ($this->request->isPost()) {
             $backend = new Backend();
-            $bckresult = trim($backend->configdRun("template reload OPNsense.HelloWorld"));
+            $bckresult = trim($backend->configdRun('template reload OPNsense/HelloWorld'));
             if ($bckresult == "OK") {
                 $status = "ok";
             }
diff --git a/net/ftp-proxy/src/opnsense/mvc/app/controllers/OPNsense/FtpProxy/Api/ServiceController.php b/net/ftp-proxy/src/opnsense/mvc/app/controllers/OPNsense/FtpProxy/Api/ServiceController.php
index 99d8623a5..476ecbefb 100644
--- a/net/ftp-proxy/src/opnsense/mvc/app/controllers/OPNsense/FtpProxy/Api/ServiceController.php
+++ b/net/ftp-proxy/src/opnsense/mvc/app/controllers/OPNsense/FtpProxy/Api/ServiceController.php
@@ -163,7 +163,7 @@ class ServiceController extends ApiControllerBase
 			return trim($backend->configdpRun('ftpproxy ' . $action, array($instance)));
 		}
 		if ($action == 'template') {
-			return trim($backend->configdRun("template reload OPNsense.FtpProxy"));
+			return trim($backend->configdRun('template reload OPNsense/FtpProxy'));
 		}
 		if ($action == 'reload') {
 			return trim($backend->configdRun("ftpproxy reload"));
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
index d9e8d989b..235e4aa5d 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
@@ -134,7 +134,7 @@ class ServiceController extends ApiControllerBase
             }
 
             // generate template
-            $backend->configdRun("template reload OPNsense.HAProxy");
+            $backend->configdRun('template reload OPNsense/HAProxy');
 
             // (res)start daemon
             if ($mdlProxy->general->enabled->__toString() == 1) {
@@ -160,7 +160,7 @@ class ServiceController extends ApiControllerBase
     {
         $backend = new Backend();
         // first generate template based on current configuration
-        $backend->configdRun("template reload OPNsense.HAProxy");
+        $backend->configdRun('template reload OPNsense/HAProxy');
         // now export all the required files (or syntax check will fail)
         $backend->configdRun("haproxy setup");
         // finally run the syntax check
diff --git a/www/web-proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/SSOProxyAD/Api/ServiceController.php b/www/web-proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/SSOProxyAD/Api/ServiceController.php
index 7a4e47517..71c8d54e1 100644
--- a/www/web-proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/SSOProxyAD/Api/ServiceController.php
+++ b/www/web-proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/SSOProxyAD/Api/ServiceController.php
@@ -56,7 +56,7 @@ class ServiceController extends ApiControllerBase
                 }
             }
             $backend = new Backend();
-            $bckresult = trim($backend->configdRun("template reload OPNsense.SSOProxyAD"));
+            $bckresult = trim($backend->configdRun('template reload OPNsense/SSOProxyAD'));
             if ($bckresult == "OK") {
                 $status = "ok";
             }