From ad089da837a7eabfccf1cf20ad7e4fdb4368bd5f Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 4 Mar 2018 15:18:17 +0100
Subject: [PATCH] MVC, use predefined configuration in stead of relative path
 in service conf to ease development/test setup.

---
 src/opnsense/mvc/app/config/services.php     | 5 ++---
 src/opnsense/mvc/app/config/services_api.php | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/config/services.php b/src/opnsense/mvc/app/config/services.php
index 91119b1fa..e287e113c 100644
--- a/src/opnsense/mvc/app/config/services.php
+++ b/src/opnsense/mvc/app/config/services.php
@@ -107,9 +107,8 @@ $di->set('config', $config);
 /**
  * Setup router
  */
-$di->set('router', function () {
-
-    $routing = new Routing(__DIR__."/../controllers/", "ui");
+$di->set('router', function () use ($config) {
+    $routing = new Routing($config->application->controllersDir, "ui");
     $routing->getRouter()->handle();
     return $routing->getRouter();
 });
diff --git a/src/opnsense/mvc/app/config/services_api.php b/src/opnsense/mvc/app/config/services_api.php
index 109fec94c..00ce7029d 100644
--- a/src/opnsense/mvc/app/config/services_api.php
+++ b/src/opnsense/mvc/app/config/services_api.php
@@ -85,9 +85,8 @@ $di->set('config', $config);
 /**
  * Setup router
  */
-$di->set('router', function () {
-
-    $routing = new Routing(__DIR__."/../controllers/", "api");
+$di->set('router', function () use ($config) {
+    $routing = new Routing($config->application->controllersDir, "api");
     $routing->getRouter()->handle();
     return $routing->getRouter();
 });