natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1284 from akihikodaki/master 

Pass hostname instead of host to vhost module
This commit is contained in:
syuilo 2018-03-25 22:51:45 +09:00 committed by GitHub
parent 8047512906 dc351ef396
commit 687cd56cc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/server.ts
View File

@ -14,6 +14,11 @@ import vhost = require('vhost');
import log from './log-request'; import log from './log-request';
import config from './conf'; import config from './conf';
function extractHostname(host) {
const index = host.indexOf(':');
return index < 0 ? host : host.substr(0, index);
}
/** /**
* Init app * Init app
*/ */
@ -53,9 +58,11 @@ app.use((req, res, next) => {
/** /**
* Register modules * Register modules
*/ */
app.use(vhost(`api.${config.host}`, require('./api/server'))); const hostname = extractHostname(config.host);
app.use(vhost(config.secondary_host, require('./himasaku/server'))); const secondaryHostname = extractHostname(config.secondary_host);
app.use(vhost(`file.${config.secondary_host}`, require('./file/server'))); app.use(vhost(`api.${hostname}`, require('./api/server')));
app.use(vhost(secondaryHostname, require('./himasaku/server')));
app.use(vhost(`file.${secondaryHostname}`, require('./file/server')));
app.use(require('./web/server')); app.use(require('./web/server'));
/** /**