Revert 96bc17aa10

src/server/api/endpoints/meta.ts

@@ -46,7 +46,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		description: instance.description,
 		langs: instance.langs,
 
-		secure: config.https.isJust(),
+		secure: config.https != null,
 		machine: os.hostname(),
 		os: os.platform(),
 		node: process.version,
@@ -83,9 +83,9 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			registration: !instance.disableRegistration,
 			localTimeLine: !instance.disableLocalTimeline,
 			globalTimeLine: !instance.disableGlobalTimeline,
-			elasticsearch: config.elasticsearch.isJust(),
+			elasticsearch: config.elasticsearch ? true : false,
 			recaptcha: instance.enableRecaptcha,
-			objectStorage: config.drive.storage === 'minio',
+			objectStorage: config.drive && config.drive.storage === 'minio',
 			twitter: instance.enableTwitterIntegration,
 			github: instance.enableGithubIntegration,
 			discord: instance.enableDiscordIntegration,

src/server/api/endpoints/users/recommendation.ts

@@ -50,7 +50,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 
 		request({
 			url: url,
-			proxy: config.proxy.getOrElse(null),
+			proxy: config.proxy,
 			timeout: timeout,
 			json: true,
 			followRedirect: true,

src/server/api/streaming.ts

@@ -23,10 +23,10 @@ module.exports = (server: http.Server) => {
 
 		let ev: EventEmitter;
 
-		if (config.redis.isJust()) {
+		if (config.redis) {
 			// Connect to Redis
 			const subscriber = redis.createClient(
-				config.redis.get().port, config.redis.get().host);
+				config.redis.port, config.redis.host);
 
 			subscriber.subscribe('misskey');
 

src/server/index.ts

@@ -96,14 +96,13 @@ app.use(router.routes());
 app.use(mount(require('./web')));
 
 function createServer() {
-	if (config.https.isJust()) {
-		const opts = {
-			key: fs.readFileSync(config.https.get().key),
-			cert: fs.readFileSync(config.https.get().cert),
-			...config.https.get().ca.map<any>(path => ({ ca: fs.readFileSync(path) })).getOrElse({}),
-			allowHTTP1: true
-		};
-		return http2.createSecureServer(opts, app.callback()) as https.Server;
+	if (config.https) {
+		const certs: any = {};
+		for (const k of Object.keys(config.https)) {
+			certs[k] = fs.readFileSync(config.https[k]);
+		}
+		certs['allowHTTP1'] = true;
+		return http2.createSecureServer(certs, app.callback()) as https.Server;
 	} else {
 		return http.createServer(app.callback());
 	}

src/server/proxy/proxy-media.ts

@@ -69,7 +69,7 @@ async function fetch(url: string, path: string) {
 
 		const req = request({
 			url: requestUrl,
-			proxy: config.proxy.getOrElse(null),
+			proxy: config.proxy,
 			timeout: 10 * 1000,
 			headers: {
 				'User-Agent': config.user_agent

src/server/web/index.ts

@@ -31,9 +31,7 @@ const app = new Koa();
 app.use(views(__dirname + '/views', {
 	extension: 'pug',
 	options: {
-		config: {
-			url: config.url
-		}
+		config
 	}
 }));