@@ -17,7 +17,6 @@ var Settings = require('./lib/settings')
17
17
18
18
var app = express ( )
19
19
var server = require ( 'http' ) . Server ( app )
20
- var io = require ( 'socket.io' ) ( server )
21
20
22
21
setupBasicAuth ( config , app )
23
22
@@ -27,8 +26,6 @@ app.use(bodyParser.urlencoded({ extended: false }))
27
26
morgan . token ( 'user' , function ( req ) { return req . auth ? req . auth . user : 'anon' } )
28
27
app . use ( morgan ( config . logFormat || 'dev' ) )
29
28
30
- app . use ( serveStatic ( path . join ( __dirname , 'public' ) ) )
31
-
32
29
var logs = new Logs ( config )
33
30
34
31
var manager = new Manager ( config , logs )
@@ -40,11 +37,22 @@ mods.updateMods()
40
37
41
38
var settings = new Settings ( config )
42
39
43
- app . use ( '/api/logs' , require ( './routes/logs' ) ( logs ) )
44
- app . use ( '/api/missions' , require ( './routes/missions' ) ( missions ) )
45
- app . use ( '/api/mods' , require ( './routes/mods' ) ( mods ) )
46
- app . use ( '/api/servers' , require ( './routes/servers' ) ( manager , mods ) )
47
- app . use ( '/api/settings' , require ( './routes/settings' ) ( settings ) )
40
+ var baseUrl = config . baseUrl || '/'
41
+ var router = express . Router ( )
42
+
43
+ router . use ( '/api/logs' , require ( './routes/logs' ) ( logs ) )
44
+ router . use ( '/api/missions' , require ( './routes/missions' ) ( missions ) )
45
+ router . use ( '/api/mods' , require ( './routes/mods' ) ( mods ) )
46
+ router . use ( '/api/servers' , require ( './routes/servers' ) ( manager , mods ) )
47
+ router . use ( '/api/settings' , require ( './routes/settings' ) ( settings ) )
48
+ router . use ( '/' , require ( './routes/main' ) ( baseUrl ) )
49
+ router . use ( serveStatic ( path . join ( __dirname , 'public' ) ) )
50
+
51
+ app . use ( baseUrl , router )
52
+
53
+ var io = require ( 'socket.io' ) ( server , {
54
+ path : baseUrl + 'socket.io'
55
+ } )
48
56
49
57
io . on ( 'connection' , function ( socket ) {
50
58
socket . emit ( 'missions' , missions . missions )
0 commit comments