diff options
| author | Simon Rettberg | 2017-07-12 18:39:21 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-07-12 18:39:21 +0200 |
| commit | 6b5d3a94ed1b62728957b04b36a08327837b0b5f (patch) | |
| tree | c3cf440c5ca2a6a34b74d08d5a571bc1312aa2e2 /modules-available/locationinfo | |
| parent | [baseconfig_partitions_cdn] Fix warning (diff) | |
| download | slx-admin-6b5d3a94ed1b62728957b04b36a08327837b0b5f.tar.gz slx-admin-6b5d3a94ed1b62728957b04b36a08327837b0b5f.tar.xz slx-admin-6b5d3a94ed1b62728957b04b36a08327837b0b5f.zip | |
[runmode] Tweaks, support NO_CONFIG and systemd target
Diffstat (limited to 'modules-available/locationinfo')
| -rw-r--r-- | modules-available/locationinfo/hooks/runmode/config.json | 5 | ||||
| -rw-r--r-- | modules-available/locationinfo/inc/locationinfo.inc.php | 8 |
2 files changed, 12 insertions, 1 deletions
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); + } + } |