diff --git a/src/config.ts b/src/config.ts
index 406183c91b..349b161de1 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -37,7 +37,6 @@ type Source = {
url: string;
};
url: string;
- secondary_url: string;
port: number;
https?: { [x: string]: string };
mongodb: {
@@ -106,9 +105,6 @@ type Mixin = {
hostname: string;
scheme: string;
ws_scheme: string;
- secondary_host: string;
- secondary_hostname: string;
- secondary_scheme: string;
api_url: string;
ws_url: string;
auth_url: string;
@@ -129,21 +125,15 @@ export default function load() {
// Validate URLs
if (!isUrl(config.url)) urlError(config.url);
- if (!isUrl(config.secondary_url)) urlError(config.secondary_url);
const url = new URL(config.url);
- const secondaryUrl = new URL(config.secondary_url);
config.url = normalizeUrl(config.url);
- config.secondary_url = normalizeUrl(config.secondary_url);
mixin.host = url.host;
mixin.hostname = url.hostname;
mixin.scheme = url.protocol.replace(/:$/, '');
mixin.ws_scheme = mixin.scheme.replace('http', 'ws');
mixin.ws_url = `${mixin.ws_scheme}://${mixin.host}`;
- mixin.secondary_host = config.secondary_url.substr(config.secondary_url.indexOf('://') + 3);
- mixin.secondary_hostname = secondaryUrl.hostname;
- mixin.secondary_scheme = config.secondary_url.substr(0, config.secondary_url.indexOf('://'));
mixin.api_url = `${mixin.scheme}://${mixin.host}/api`;
mixin.auth_url = `${mixin.scheme}://auth.${mixin.host}`;
mixin.ch_url = `${mixin.scheme}://ch.${mixin.host}`;
@@ -151,7 +141,7 @@ export default function load() {
mixin.docs_url = `${mixin.scheme}://docs.${mixin.host}`;
mixin.stats_url = `${mixin.scheme}://stats.${mixin.host}`;
mixin.status_url = `${mixin.scheme}://status.${mixin.host}`;
- mixin.drive_url = `${mixin.secondary_scheme}://file.${mixin.secondary_host}`;
+ mixin.drive_url = `${mixin.scheme}://${mixin.host}/files`;
return Object.assign(config, mixin);
}
diff --git a/src/himasaku/assets/himasaku.png b/src/himasaku/assets/himasaku.png
deleted file mode 100644
index 25cd91e954..0000000000
Binary files a/src/himasaku/assets/himasaku.png and /dev/null differ
diff --git a/src/himasaku/assets/index.html b/src/himasaku/assets/index.html
deleted file mode 100644
index f9e45d7a74..0000000000
--- a/src/himasaku/assets/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
- ひまさく
-
-
-
- 
-
-
diff --git a/src/himasaku/server.ts b/src/himasaku/server.ts
deleted file mode 100644
index fb129513de..0000000000
--- a/src/himasaku/server.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Himasaku Server
- */
-
-import * as express from 'express';
-
-/**
- * Init app
- */
-const app = express();
-
-app.disable('x-powered-by');
-app.locals.cache = true;
-
-app.get('/himasaku.png', (req, res) => {
- res.sendFile(`${__dirname}/assets/himasaku.png`);
-});
-
-app.get('*', (req, res) => {
- res.sendFile(`${__dirname}/assets/index.html`);
-});
-
-module.exports = app;
diff --git a/src/server.ts b/src/server.ts
index fb581bae5d..00d09f1538 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -54,8 +54,7 @@ app.use((req, res, next) => {
* Register modules
*/
app.use('/api', require('./api/server'));
-app.use(vhost(config.secondary_hostname, require('./himasaku/server')));
-app.use(vhost(`file.${config.secondary_hostname}`, require('./file/server')));
+app.use('/files', require('./file/server'));
app.use(require('./web/server'));
/**