Skip to content

Commit

Permalink
Merge pull request #22 from kriszyp/master
Browse files Browse the repository at this point in the history
Latest updates
  • Loading branch information
kriszyp committed Oct 13, 2013
2 parents 0f13e7e + d1fb2af commit 5c0c890
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var publicModel = {
Page: pageFacets.PublicFacet,
PageChange: pageChangeFacets.PublicFacet,
User: User,
File: Restrictive(File),
File: File,
Class: Restrictive(ClassModel)
};

Expand Down
6 changes: 3 additions & 3 deletions local.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"//": "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,
"//": "This is the HTTP port to listen on (default to the PORT environment variable or 80)",
"port": null,
"//": "Indicates whether the console should run",
"repl": true,
"//": "Indicates a TCP/port connection for the console (omit to disable)",
Expand All @@ -27,4 +27,4 @@
},
"//": "Default location of data",
"dataFolder": "data"
}
}
4 changes: 2 additions & 2 deletions model/page-mongo.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* This provides the definition of the mongo store if used
*/

var MongoDB = require("perstore/store/mongodb").MongoDB,
var MongoDB = require("mongodb-store").MongoDB,
// url takes this form - mongodb://<user>:<password>@<mongo-server>:<port>/<database>
url = process.env.MONGO_URL;
url = "mongodb://localhost";//process.env.MONGO_URL;

exports.pageStore = MongoDB({
collection: "Page",
Expand Down
4 changes: 2 additions & 2 deletions model/page-sql.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* This provides the definition of the SQL store if used
*/

var SQLStore = require("perstore/store/sql").SQLStore;
var SQLStore = require("mysql-store").SQLStore;
//CREATE TABLE Page (id VARCHAR(100), status VARCHAR(10), content VARCHAR(100000), createdBy VARCHAR(20), lastModifiedBy VARCHAR(20), PRIMARY KEY(id))
exports.pageStore = SQLStore({
table: "Page",
table: "Test",
idColumn: "id"
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "persevere-example-wiki",
"author": "",
"version": "0.0.4",
"version": "0.2.5",
"contributors": [],
"mappings":{
"perstore": "http://github.com/kriszyp/perstore/zipball/v0.2.4!/",
Expand Down

0 comments on commit 5c0c890

Please sign in to comment.