Updated TODO. Post-fixed setup check for testing.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5643 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/TODO b/TODO
index 9dc5c0475ca2f7d780199407cba3635ab364f29f..2c12cb7d7f09c0f56d845035b74ed636bb63b254 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
 Target for 2.6:
 ===============
 
+* Move from gosa.conf-trunk to gosa.conf when we're ready
+
 * ACL
   - Acl roles should be selectable in acl dialog.
   - Role checks are missing

diff --git a/html/index.php b/html/index.php
index 14a8b30054b09b7d5193d610d50dc41a31cdb0a0..1fdcf4bb3b91d101f6385ad10e4d0de6828ffd21 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -101,7 +101,7 @@ $_SESSION['errorsAlreadyPosted']= array();
 $_SESSION['LastError']          = "";
 
 /* Check if we need to run setup */
-if (!file_exists(CONFIG_DIR."/gosa.conf")){
+if (!file_exists(CONFIG_DIR."/gosa.conf-trunk")){
   header("location:setup.php");
   exit();
 }