Permalink
Browse files

Nest admin list in security object and add comments to local.json

  • Loading branch information...
1 parent 4ec04d6 commit d19faeeab479d3ef63fd2af09cc1b47765cc9a30 @kriszyp committed Jul 15, 2010
Showing with 22 additions and 5 deletions.
  1. +1 −1 lib/access.js
  2. +21 −4 local.json
View
@@ -1,7 +1,7 @@
/**
* Defines the capabilities of different users
*/
-var admins = require("settings").admins,
+var admins = require("settings").security.admins,
Register = require("security").Register,
security = require("pintura").config.security;
View
@@ -1,13 +1,30 @@
{
+ "//": "For production, you would normally want the number of processes to match the number of cores, but for debugging, using 1 is much easier:",
+ "processes": 1,
+ "//": "This is the HTTP port to listen on:",
+ "port": 8080,
+ "//": "Indicates whether the console should run",
+ "repl": true,
+ "//": "Indicates a TCP/port connection for the console (omit to disable)",
+ "replPort": 5555,
+ "//": "Database settings",
"database": {
- "connection":"jdbc:mysql://localhost/template?user=root&password=&useUnicode=true&characterEncoding=utf-8&autoReconnect=true",
- "type": "mysql"
+ "connection":"jdbc:mysql://localhost/wiki?user=root&password=root&useUnicode=true&characterEncoding=utf-8&autoReconnect=true",
+ "type": "mysql",
+ "host": "localhost",
+ "port": 8889,
+ "name": "test"
},
"mail": {
"host":"mail.site.com",
"defaultFrom": "app@site.com"
},
- "bypassSecurity": true,
- "admins":["admin"],
+ "security":{
+ "//": "Bypass security for initial setup",
+ "bypass": true,
+ "//": "List of admins",
+ "admins":["admin"],
+ },
+ "//": "Default location of data",
"dataFolder": "data"
}

0 comments on commit d19faee

Please sign in to comment.