summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorJohann150 <johann.galle@protonmail.com>2022-03-08 15:23:18 +0100
committerGitHub <noreply@github.com>2022-03-08 23:23:18 +0900
commit26d90cd030a4fb802b68e2bb1f117f9b925c0f6d (patch)
tree10a11b11c4788521be4552d809f5e7a6812779f0 /packages/backend/src
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadsharkey-26d90cd030a4fb802b68e2bb1f117f9b925c0f6d.tar.gz
sharkey-26d90cd030a4fb802b68e2bb1f117f9b925c0f6d.tar.bz2
sharkey-26d90cd030a4fb802b68e2bb1f117f9b925c0f6d.zip
remove HTTPS handling (#8380)
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/config/types.ts1
-rw-r--r--packages/backend/src/server/api/endpoints/meta.ts8
-rw-r--r--packages/backend/src/server/index.ts13
3 files changed, 1 insertions, 21 deletions
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index 7a1b83c99b..58a27803cb 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -6,7 +6,6 @@ export type Source = {
feedback_url?: string;
url: string;
port: number;
- https?: { [x: string]: string };
disableHsts?: boolean;
db: {
host: string;
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 6231c35ab9..1aff1f63fb 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -64,11 +64,6 @@ export const meta = {
optional: false, nullable: false,
default: 'https://github.com/misskey-dev/misskey/issues/new',
},
- secure: {
- type: 'boolean',
- optional: false, nullable: false,
- default: false,
- },
defaultDarkTheme: {
type: 'string',
optional: false, nullable: true,
@@ -489,9 +484,6 @@ export default define(meta, paramDef, async (ps, me) => {
tosUrl: instance.ToSUrl,
repositoryUrl: instance.repositoryUrl,
feedbackUrl: instance.feedbackUrl,
-
- secure: config.https != null,
-
disableRegistration: instance.disableRegistration,
disableLocalTimeline: instance.disableLocalTimeline,
disableGlobalTimeline: instance.disableGlobalTimeline,
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 80130e8843..95a9ec6a00 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -4,8 +4,6 @@
import * as fs from 'node:fs';
import * as http from 'http';
-import * as http2 from 'http2';
-import * as https from 'https';
import Koa from 'koa';
import Router from '@koa/router';
import mount from 'koa-mount';
@@ -123,16 +121,7 @@ app.use(router.routes());
app.use(mount(webServer));
function createServer() {
- 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());
- }
+ return http.createServer(app.callback());
}
// For testing