Commit a58072a1 authored by nanahira's avatar nanahira

Merge branch 'master' of git.mycard.moe:nanahira/nginx-proxy

parents 2be68c77 bc7cabfe
Pipeline #24985 passed with stages
in 20 minutes and 7 seconds
...@@ -5,7 +5,7 @@ import md5 from 'nano-md5'; ...@@ -5,7 +5,7 @@ import md5 from 'nano-md5';
import fs from 'fs'; import fs from 'fs';
export interface SiteHttps { export interface SiteHttps {
ports: number[]; ports: string[];
cert: string; cert: string;
redirect?: boolean; redirect?: boolean;
hsts?: boolean; hsts?: boolean;
...@@ -18,7 +18,7 @@ export interface Header { ...@@ -18,7 +18,7 @@ export interface Header {
export interface SiteRenderData { export interface SiteRenderData {
domains: string[]; domains: string[];
ports: number[]; ports: string[];
https?: SiteHttps; https?: SiteHttps;
headers?: Header[]; headers?: Header[];
normalizeDomain?: string; normalizeDomain?: string;
...@@ -105,7 +105,7 @@ async function getSiteData( ...@@ -105,7 +105,7 @@ async function getSiteData(
if (cert) { if (cert) {
https = { https = {
cert, cert,
ports: parser.getArrayNumber('HTTPS_PORT') || [443], ports: parser.getArray('HTTPS_PORT') || ['443'],
redirect: !parser.getBoolean('HTTPS_NOREDIR'), redirect: !parser.getBoolean('HTTPS_NOREDIR'),
hsts: parser.getBoolean('HSTS'), hsts: parser.getBoolean('HSTS'),
}; };
...@@ -166,7 +166,7 @@ async function getSiteData( ...@@ -166,7 +166,7 @@ async function getSiteData(
return { return {
domains: domains, domains: domains,
ports: parser.getArrayNumber('PORT') || [80], ports: parser.getArray('PORT') || ['80'],
https, https,
headers: Object.entries(parser.getDict('HEADER')).map(([name, value]) => ({ headers: Object.entries(parser.getDict('HEADER')).map(([name, value]) => ({
name: name.replace(/_/g, '-'), name: name.replace(/_/g, '-'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment