-rw-r--r-- | backend/node/src/app.js | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/backend/node/src/app.js b/backend/node/src/app.js index d4d60c2..61c2c72 100644 --- a/backend/node/src/app.js +++ b/backend/node/src/app.js | |||
@@ -17,6 +17,16 @@ var EXPRESS = require('express'); | |||
17 | var HTTP = require('http'); | 17 | var HTTP = require('http'); |
18 | var PATH = require('path'); | 18 | var PATH = require('path'); |
19 | 19 | ||
20 | |||
21 | var CLIPPERZ = require('./clipperz'); | ||
22 | var CONF = require('./conf'); | ||
23 | var clipperz = CLIPPERZ({ | ||
24 | psql: CONF.psql||'postgresql:///clipperz', | ||
25 | logger: LOGGER, | ||
26 | dump_template: PATH.join(__dirname,'htdocs/beta/index.html') | ||
27 | }); | ||
28 | |||
29 | |||
20 | var app = EXPRESS(); | 30 | var app = EXPRESS(); |
21 | 31 | ||
22 | app.set('port', process.env.PORT || 3000); | 32 | app.set('port', process.env.PORT || 3000); |
@@ -24,7 +34,7 @@ app.use(EXPRESS.logger('dev')); | |||
24 | app.use(EXPRESS.urlencoded()); | 34 | app.use(EXPRESS.urlencoded()); |
25 | app.use(EXPRESS.methodOverride()); | 35 | app.use(EXPRESS.methodOverride()); |
26 | app.use(EXPRESS.cookieParser('your secret here')); | 36 | app.use(EXPRESS.cookieParser('your secret here')); |
27 | app.use(EXPRESS.session()); | 37 | app.use(EXPRESS.session({secret:'99 little bugs in the code', key:'sid', store: clipperz.session_store() })); |
28 | app.use(app.router); | 38 | app.use(app.router); |
29 | app.use(EXPRESS.static(PATH.join(__dirname, 'htdocs/'))); | 39 | app.use(EXPRESS.static(PATH.join(__dirname, 'htdocs/'))); |
30 | if ('development' == app.get('env')) { | 40 | if ('development' == app.get('env')) { |
@@ -32,14 +42,6 @@ if ('development' == app.get('env')) { | |||
32 | } | 42 | } |
33 | 43 | ||
34 | 44 | ||
35 | var CLIPPERZ = require('./clipperz'); | ||
36 | var CONF = require('./conf'); | ||
37 | var clipperz = CLIPPERZ({ | ||
38 | psql: CONF.psql||'postgresql:///clipperz', | ||
39 | logger: LOGGER, | ||
40 | dump_template: PATH.join(__dirname,'htdocs/beta/index.html') | ||
41 | }); | ||
42 | |||
43 | app.post('/json',clipperz.json); | 45 | app.post('/json',clipperz.json); |
44 | app.get('/beta/dump',clipperz.dump); | 46 | app.get('/beta/dump',clipperz.dump); |
45 | 47 | ||