diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-12-26 14:58:16 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-12-26 14:58:16 -0200 |
| commit | 0c3b882cc6a76389f687112544259cfe0cd9e4f7 (patch) | |
| tree | 3fa10e67e6e87b948249e5ce2323a09c6a80a9a2 /templates | |
| parent | 30b860c437caefbcc20fd4c45de93d4f1ad5f64c (diff) | |
| download | puppet-etherpad-0c3b882cc6a76389f687112544259cfe0cd9e4f7.tar.gz puppet-etherpad-0c3b882cc6a76389f687112544259cfe0cd9e4f7.tar.bz2 | |
Config cleanup
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/settings.json.erb | 22 |
1 files 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 %>", |