Merge pull request #245 from noderaider/0.5

added yarn.lock to gitignore and fixed npm start
This commit is contained in:
Mark Nadal 2016-10-17 23:46:32 -06:00 committed by GitHub
commit de216349be
2 changed files with 3 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
node_modules/*
npm-debug.log
yarn.lock
*data.json
*.db
.idea/

View File

@ -1,6 +1,6 @@
var port = process.env.OPENSHIFT_NODEJS_PORT || process.env.VCAP_APP_PORT || process.env.PORT || process.argv[2] || 80;
var Gun = require('gun');
var Gun = require('../');
var gun = Gun({
file: 'data.json',
s3: {
@ -22,4 +22,4 @@ var server = require('http').createServer(function(req, res){
gun.wsp(server);
server.listen(port);
console.log('Server started on port ' + port + ' with /gun');
console.log('Server started on port ' + port + ' with /gun');