Updating config file

diff --git a/templates/settings.json.erb b/templates/settings.json.erb
index af1ca63b949f6b12180ec3dabbe66a062d849722..824422812f4382b5792dc3a476fde7f8cfd8e132 100644 (file)
--- a/templates/settings.json.erb
+++ b/templates/settings.json.erb
@@ -5,6 +5,13 @@
   Please edit settings.json, not settings.json.template
 */
 {
+  // Name your instance!
+  "title": "Etherpad Lite",
+
+  // favicon default name
+  // alternatively, set up a fully specified Url to your own favicon
+  "favicon": "favicon.ico",
+
   //Ip and port which etherpad should bind at
   "ip": "0.0.0.0",
   "port" : 9001,
@@ -31,12 +38,35 @@
      but makes it impossible to debug the javascript/css */
   "minify" : true,
   
+  /* How long may clients use served javascript code (in seconds)? Without versioning this
+     may cause problems during deployment. Set to 0 to disable caching */
+  "maxAge" : 21600, // 60 * 60 * 6 = 6 hours
+
   /* 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" : "/usr/bin/abiword",
   
-  /* This setting is used if you need http basic auth */
-  // "httpAuth" : "user:pass",
+  /* This setting is used if you require authentication of all users.
+     Note: /admin always requires authentication. */
+  "requireAuthentication": false,
+
+  /* Require authorization by a module, or a user with is_admin set, see below. */
+  "requireAuthorization": false,
+
+  /* Users for basic authentication. is_admin = true gives access to /admin.
+     If you do not uncomment this, /admin will not be available! */
+  /*
+  "users": {
+    "admin": {
+      "password": "changeme1",
+      "is_admin": true
+    },
+    "user": {
+      "password": "changeme1",
+      "is_admin": false
+    }
+  },
+  */
 
   /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */
   "loglevel": "INFO"