Config cleanup

diff --git a/templates/settings.json.erb b/templates/settings.json.erb
index 376b603ebf6e683466090a98c7e4672cf270dc6b..e06fd24c5a7f97c0815a90c5ccadf72b7bfb5fc3 100644 (file)
--- a/templates/settings.json.erb
+++ b/templates/settings.json.erb
@@ -9,27 +9,9 @@
   "ip": "0.0.0.0",
   "port" : 9001,
   
-  //The Type of the database. You can choose between dirty, sqlite and mysql
-  //You should use mysql or sqlite for anything else than testing or development
-  //"dbType" : "dirty",
-  //the database specific settings
-  /*
+  //Database configuration
+  "dbType" : "mysql",
   "dbSettings" : {
-                   "filename" : "../var/dirty.db"
-                 },
-
-  */             
-  /* An Example of MySQL Configuration
-   "dbType" : "mysql",
-   "dbSettings" : {
-                    "user"    : "root", 
-                    "host"    : "localhost", 
-                    "password": "", 
-                    "database": "store"
-                  },
-  */
-   "dbType" : "mysql",
-   "dbSettings" : {
                     "user"    : "etherpad", 
                     "host"    : "localhost", 
                     "password": "<%= etherpad_db_password %>",