From 0c3b882cc6a76389f687112544259cfe0cd9e4f7 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 26 Dec 2011 14:58:16 -0200
Subject: Config cleanup

---
 templates/settings.json.erb | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/templates/settings.json.erb b/templates/settings.json.erb
index 376b603..e06fd24 100644
--- 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 %>", 
-- 
cgit v1.2.3