Permalink
Browse files

Store settings.json directly

  • Loading branch information...
rossmeissl committed Apr 10, 2012
1 parent a4b035e commit 9aaae7468e91a83d18fe15c7f15b3038644abecd
Showing with 7 additions and 62 deletions.
  1. +0 −1 .gitignore
  2. +7 −17 settings.json.template → settings.json
  3. +0 −44 settings.json.template_windows
View
@@ -1,5 +1,4 @@
node_modules
-settings.json
APIKEY.txt
bin/abiword.exe
bin/node.exe
@@ -6,25 +6,15 @@
{
//Ip and port which etherpad should bind at
"ip": "0.0.0.0",
- "port" : 9001,
+ "port" : 3000,
- //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
+ "dbType" : "postgres",
"dbSettings" : {
- "filename" : "../var/dirty.db"
+ "user" : url.parse(process.env.DATABASE_URL).auth.split(':')[0],
+ "password": url.parse(process.env.DATABASE_URL).auth.split(':')[1],
+ "host" : url.parse(process.env.DATABASE_URL).hostname,
+ "database": url.parse(process.env.DATABASE_URL).pathname.replace(/^\//, '')
},
-
- /* An Example of MySQL Configuration
- "dbType" : "mysql",
- "dbSettings" : {
- "user" : "root",
- "host" : "localhost",
- "password": "",
- "database": "store"
- },
- */
//the default text of a pad
"defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n",
@@ -37,7 +27,7 @@
/* if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly,
but makes it impossible to debug the javascript/css */
- "minify" : true,
+ "minify" : false,
/* How long may clients use served javascript code? Without versioning this
is may cause problems during deployment. */
@@ -1,44 +0,0 @@
-/*
- This file must be valid JSON. But comments are allowed
-
- Please edit settings.json, not settings.json.template
-*/
-{
- //Ip and port which etherpad should bind at
- "ip": "0.0.0.0",
- "port" : 9001,
-
- //The Type of the database. You can choose between sqlite and mysql
- "dbType" : "dirty",
- //the database specific settings
- "dbSettings" : {
- "filename" : "../var/dirty.db"
- },
-
- /* An Example of MySQL Configuration
- "dbType" : "mysql",
- "dbSettings" : {
- "user" : "root",
- "host" : "localhost",
- "password": "",
- "database": "store"
- },
- */
-
- //the default text of a pad
- "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n",
-
- /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */
- "requireSession" : false,
-
- /* Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads. */
- "editOnly" : false,
-
- /* if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly,
- but makes it impossible to debug the javascript/css */
- "minify" : false,
-
- /* This is the path to the Abiword executable. Setting it to null, disables abiword.
- Abiword is needed to enable the import/export of pads*/
- "abiword" : null
-}

0 comments on commit 9aaae74

Please sign in to comment.