diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-03-25 22:51:45 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-25 22:51:45 +0900 |
| commit | 687cd56cc1c1668f909644ec6fe574c42bb6cffb (patch) | |
| tree | 241502f919283ca3e91addd362094a3dabeb9260 /src | |
| parent | Merge pull request #1283 from akihikodaki/master (diff) | |
| parent | Pass hostname instead of host to vhost module (diff) | |
| download | sharkey-687cd56cc1c1668f909644ec6fe574c42bb6cffb.tar.gz sharkey-687cd56cc1c1668f909644ec6fe574c42bb6cffb.tar.bz2 sharkey-687cd56cc1c1668f909644ec6fe574c42bb6cffb.zip | |
Merge pull request #1284 from akihikodaki/master
Pass hostname instead of host to vhost module
Diffstat (limited to 'src')
| -rw-r--r-- | src/server.ts | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/server.ts b/src/server.ts index a2165d672b..84e8c41489 100644 --- a/src/server.ts +++ b/src/server.ts @@ -14,6 +14,11 @@ import vhost = require('vhost'); import log from './log-request'; import config from './conf'; +function extractHostname(host) { + const index = host.indexOf(':'); + return index < 0 ? host : host.substr(0, index); +} + /** * Init app */ @@ -53,9 +58,11 @@ app.use((req, res, next) => { /** * Register modules */ -app.use(vhost(`api.${config.host}`, require('./api/server'))); -app.use(vhost(config.secondary_host, require('./himasaku/server'))); -app.use(vhost(`file.${config.secondary_host}`, require('./file/server'))); +const hostname = extractHostname(config.host); +const secondaryHostname = extractHostname(config.secondary_host); +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')); /** |