From 876479a5c07693b64398f2c99b1da352b1b8a89e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Sun, 13 Sep 2015 17:53:38 +0200 Subject: [Trigger] Consider ldap config modules when launching ldadp instances --- config.php.example | 2 +- inc/trigger.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.php.example b/config.php.example index 929e7e2e..fcab800a 100644 --- a/config.php.example +++ b/config.php.example @@ -15,7 +15,7 @@ define('CONFIG_SQL_FORCE_UTF8', true); define('CONFIG_TGZ_LIST_DIR', '/opt/openslx/configs'); -define('CONFIG_REMOTE_ML', 'https://bwlp-masterserver.ruf.uni-freiburg.de/minilinux/sat_01'); +define('CONFIG_REMOTE_ML', 'https://bwlp-masterserver.ruf.uni-freiburg.de/minilinux/sat_02'); define('CONFIG_TFTP_DIR', '/srv/openslx/tftp'); define('CONFIG_HTTP_DIR', '/srv/openslx/www/boot'); diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php index 9062cafd..5ad11a91 100644 --- a/inc/trigger.inc.php +++ b/inc/trigger.inc.php @@ -88,7 +88,7 @@ class Trigger $res = Database::simpleQuery("SELECT moduleid, configtgz.filepath FROM configtgz_module" . " INNER JOIN configtgz_x_module USING (moduleid)" . " INNER JOIN configtgz USING (configid)" - . " WHERE moduletype = 'AdAuth'"); + . " WHERE moduletype IN ('AdAuth', 'LdapAuth')"); // TODO: Multiconfig support $id = array(); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { -- cgit v1.2.3-55-g7522