Browse Source

Merge https://github.com/nafets/FSyncMS into Setup-Page

Conflicts:
	README.md
	setup.php
balu 12 years ago
parent
commit
a961443320
4 changed files with 32 additions and 38 deletions
  1. 2 0
      .gitignore
  2. 30 4
      README.md
  3. 0 23
      settings.php
  4. 0 11
      setup.php

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+*~
+*.swp

+ 30 - 4
README.md

@@ -10,17 +10,43 @@ sowie alte Versionen und Anleitungen sind hier:
 https://www.ohnekontur.de/category/technik/sync/fsyncms/
 
 zu finden.
-Ein Umzug zu Github sowie weitere Erweiterungen sind in Planung.
+Weitere Erweiterungen sind in Planung.
 Stay tuned.
 
 
 Visit http://www.ohnekontur.de/2011/07/24/how-to-install-fsyncms-firefox-sync-eigener-server/ for install instructions
 Visit http://www.ohnekontur.de for the newest version
 
-FSyncMS beta
+FSyncMS v011
 ======
-Setup Page für einfaches Setup 
-von Stefan 
+Added dedicated setup script, which will create the database and the config file: settings.php
+
+If you want to create it by your own, just generate the settings.php with the following content
+
+    <?php
+        //you can disable registration to the firefox sync server here,
+        // by setting ENABLE_REGISTER to false
+        //
+        //
+        //define("ENABLE_REGISTER",false);
+        define("ENABLE_REGISTER", true);
+
+
+        //pleas set the URL where firefox clients find the root of 
+        // firefox sync server
+        // this should end with a /
+        //
+        define("FSYNCMS_ROOT","https://DOMAIN.de/Folder_und_ggf_/index.php/");
+
+        //MYSQL Params
+        define("MYSQL_ENABLE", false);
+        define("MYSQL_HOST","localhost");
+        define("MYSQL_DB","databaseName");
+        define("MYSQL_USER", "databaseUserName");
+        define("MYSQL_PASSWORD", "databaseUserPW");
+
+    ?>
+
 
 FSyncMS v010
 ======

+ 0 - 23
settings.php

@@ -1,23 +0,0 @@
-<?php
-    //you can disable registration to the firefox sync server here,
-    // by setting ENABLE_REGISTER to false
-    //
-    //
-    //define("ENABLE_REGISTER",false);
-    define("ENABLE_REGISTER", true);
-
-
-    //pleas set the URL where firefox clients find the root of 
-    // firefox sync server
-    // this should end with a /
-    //
-    define("FSYNCMS_ROOT","https://DOMAIN.de/Folder_und_ggf_/index.php/");
-
-    //MYSQL Params
-    define("MYSQL_ENABLE", false);
-    define("MYSQL_HOST","localhost");
-    define("MYSQL_DB","databaseName");
-    define("MYSQL_USER", "databaseUserName");
-    define("MYSQL_PASSWORD", "databaseUserPW");
-
-?>

+ 0 - 11
setup.php

@@ -36,17 +36,6 @@
 # 
 # ***** END LICENSE BLOCK *****
 
-/*
-
-TODO:
-! - add license information
-! - write settings.php
-! - add form to select if we should use sql-lite or mysql
-! - add form to store the mysql settings
-! - check if the setup is already done
-
-*/
-
 // --------------------------------------------
 // variables start
 // --------------------------------------------