From 6b5d3a94ed1b62728957b04b36a08327837b0b5f Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 12 Jul 2017 18:39:21 +0200 Subject: [runmode] Tweaks, support NO_CONFIG and systemd target --- modules-available/locationinfo/hooks/runmode/config.json | 5 ++++- modules-available/locationinfo/inc/locationinfo.inc.php | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'modules-available/locationinfo') diff --git a/modules-available/locationinfo/hooks/runmode/config.json b/modules-available/locationinfo/hooks/runmode/config.json index 8c1ebad8..c88b20cf 100644 --- a/modules-available/locationinfo/hooks/runmode/config.json +++ b/modules-available/locationinfo/hooks/runmode/config.json @@ -1,4 +1,7 @@ { "getModeName": "LocationInfo::getPanelName", - "isClient": false + "isClient": false, + "configHook": "LocationInfo::configHook", + "noSysconfig": true, + "systemdDefaultTarget": "multi-user" } \ No newline at end of file diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php index 36a77d4f..6e6cfcd7 100644 --- a/modules-available/locationinfo/inc/locationinfo.inc.php +++ b/modules-available/locationinfo/inc/locationinfo.inc.php @@ -86,4 +86,12 @@ class LocationInfo return $ret['panelname']; } + public static function configHook($machineUuid, $panelUuid) + { + // TODO Panel type + ConfigHolder::add('SLX_BROWSER_URL', 'http://' . $_SERVER['SERVER_ADDR'] . '/panel/' . $panelUuid); + ConfigHolder::add('SLX_ADDONS', '', 1000); + ConfigHolder::add('SLX_LOGOUT_TIMEOUT', 1000); + } + } -- cgit v1.2.3-55-g7522