Browse Source

Update CA information

Matt Coles 9 years ago
parent
commit
56e988a64a
1 changed files with 13 additions and 11 deletions
  1. 13 11
      index.js

+ 13 - 11
index.js

@@ -3,16 +3,15 @@ var https = require('https');
3 3
 var express = require('express');
4 4
 var path = require('path');
5 5
 var forceSSL = require('express-force-ssl');
6
-var route_manager = require("../ip-project-server/utils/route-manager.js");
7
-var scheduler = require("../ip-project-server/presenters/schedule-controller.js");
8 6
 var bodyParser = require('body-parser');
9 7
 var serveIndex = require('serve-index');
10 8
 var basic_auth = require('basic-auth');
11 9
 var FileStreamRotator = require('file-stream-rotator');
12 10
 var morgan = require('morgan');
13
-var fs = require('fs');
14
-var logDirectory = 'log'
11
+var route_manager = require("../ip-project-server/utils/route-manager.js");
12
+var scheduler = require("../ip-project-server/presenters/schedule-controller.js");
15 13
 var app = express();
14
+var logDirectory = 'log'
16 15
 
17 16
 // Set up authentication and existing events.
18 17
 var log_passwd = fs.readFileSync('../ip-project-server/logpasswd', 'utf-8');
@@ -31,10 +30,20 @@ var auth = function (req, res, next) {
31 30
     return unauthorized(res);
32 31
   };
33 32
 };
33
+
34
+fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)
35
+var accessLogStream = FileStreamRotator.getStream({
36
+  date_format: 'YYYYMMDD',
37
+  filename: logDirectory + '/access-%DATE%.log',
38
+  frequency: 'daily',
39
+  verbose: false
40
+})
41
+
34 42
 scheduler.register_existing_events();
35 43
 
36 44
 // Always use SSL, comes first.
37 45
 app.use(forceSSL);
46
+
38 47
 app.use(bodyParser.json()); // for parsing application/json
39 48
 app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded
40 49
 
@@ -46,13 +55,6 @@ app.use('/soc-api/*', function(req, res, next) {
46 55
 });
47 56
 
48 57
 // Logging comes next
49
-fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)
50
-var accessLogStream = FileStreamRotator.getStream({
51
-  date_format: 'YYYYMMDD',
52
-  filename: logDirectory + '/access-%DATE%.log',
53
-  frequency: 'daily',
54
-  verbose: false
55
-})
56 58
 app.use(morgan('short', {stream: accessLogStream}))
57 59
 app.use(morgan('short'));
58 60