feat: disable auto https for reverse proxy (#162)

getmeli · Dec 17, 2020 · 449faa8 · 449faa8
1 parent 19815a8
commit 449faa8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/caddy/generate-config.ts b/src/caddy/generate-config.ts
@@ -13,7 +13,7 @@ const sitesUrl = new URL(env.MELI_SITES_URL);
 export async function generateConfig(): Promise<any> {
   const sites = await Sites().find().toArray();
 
-  const sslDisabled = sitesUrl.protocol === 'http:';
+  const sslDisabled = sitesUrl.protocol === 'http:' && env.MELI_HTTPS_AUTO;
   return {
     logging: {
       logs: {

diff --git a/src/env/env-spec.ts b/src/env/env-spec.ts
@@ -32,6 +32,10 @@ export const envSpec: EnvSpec<Env> = {
   MELI_SITES_URL: {
     schema: string().optional().custom(isUrl).default(process.env.MELI_URL || null),
   },
+  MELI_HTTPS_AUTO: {
+    transform: stringToBoolean(),
+    schema: boolean().optional().default(true),
+  },
   MELI_STANDALONE: {
     transform: stringToBoolean(),
     schema: boolean().optional().default(false),

diff --git a/src/env/env.ts b/src/env/env.ts
@@ -10,6 +10,7 @@ export interface Env {
   MELI_UI_URL: string;
   MELI_UI_URL_INTERNAL: string;
   MELI_SITES_URL: string;
+  MELI_HTTPS_AUTO: string;
   MELI_STANDALONE: boolean;
   MELI_UI_DIR: string;
   MELI_JWT_SECRET: string;