Commit 791076bb authored by nanahira's avatar nanahira

make extra string

parent c5c0153b
Pipeline #39294 failed with stages
in 26 seconds
...@@ -24,9 +24,9 @@ export interface SiteRenderData { ...@@ -24,9 +24,9 @@ export interface SiteRenderData {
headers?: Header[]; headers?: Header[];
normalizeDomain?: string; normalizeDomain?: string;
disableTop?: boolean; disableTop?: boolean;
serverExtra?: string[]; serverExtra?: string;
locationExtra?: string[]; locationExtra?: string;
locationExtraPre?: string[]; locationExtraPre?: string;
htpasswd?: string; htpasswd?: string;
cors?: boolean; cors?: boolean;
} }
...@@ -58,8 +58,8 @@ export interface StaticRenderData extends FileRenderData { ...@@ -58,8 +58,8 @@ export interface StaticRenderData extends FileRenderData {
export interface PhpRenderData extends FileRenderData { export interface PhpRenderData extends FileRenderData {
php: true; php: true;
upstream: string; upstream: string;
phpExtra?: string[]; phpExtra?: string;
phpExtraPre?: string[]; phpExtraPre?: string;
} }
export interface RedirectRenderData extends SiteRenderData { export interface RedirectRenderData extends SiteRenderData {
...@@ -86,10 +86,10 @@ export interface RenderData { ...@@ -86,10 +86,10 @@ export interface RenderData {
certsPath: string; certsPath: string;
sites: SiteRenderData[]; sites: SiteRenderData[];
upstreams: Upstream[]; upstreams: Upstream[];
httpExtra?: string[]; httpExtra?: string;
nginxExtra?: string[]; nginxExtra?: string;
httpExtraPre?: string[]; httpExtraPre?: string;
nginxExtraPre?: string[]; nginxExtraPre?: string;
} }
export interface Upstream { export interface Upstream {
...@@ -169,8 +169,8 @@ async function getSiteData( ...@@ -169,8 +169,8 @@ async function getSiteData(
index: parser.getString('INDEX') || 'index.php', index: parser.getString('INDEX') || 'index.php',
expires: parser.getString('EXPIRES') || '10m', expires: parser.getString('EXPIRES') || '10m',
upstream: targetUrl.host, upstream: targetUrl.host,
phpExtra: parser.getArray('PHP_EXTRA'), phpExtra: parser.getString('PHP_EXTRA'),
phpExtraPre: parser.getArray('PHP_EXTRA_PRE'), phpExtraPre: parser.getString('PHP_EXTRA_PRE'),
} as PhpRenderData; } as PhpRenderData;
} else if (targetUrl.protocol.startsWith('redirect+')) { } else if (targetUrl.protocol.startsWith('redirect+')) {
specificRenderData = { specificRenderData = {
...@@ -185,7 +185,7 @@ async function getSiteData( ...@@ -185,7 +185,7 @@ async function getSiteData(
upstream: createUpstream( upstream: createUpstream(
domain, domain,
targetUrlInputs, targetUrlInputs,
parser.getArray('UPSTREAM_EXTRA'), parser.getString('UPSTREAM_EXTRA'),
), ),
noVerifyCerts: parser.getBoolean('NO_VERIFY_CERTS'), noVerifyCerts: parser.getBoolean('NO_VERIFY_CERTS'),
noBuffer: parser.getBoolean('NO_BUFFER'), noBuffer: parser.getBoolean('NO_BUFFER'),
...@@ -219,9 +219,9 @@ async function getSiteData( ...@@ -219,9 +219,9 @@ async function getSiteData(
})), })),
normalizeDomain: parser.getString('NORMALIZE_DOMAIN'), normalizeDomain: parser.getString('NORMALIZE_DOMAIN'),
disableTop: parser.getBoolean('DISABLE_TOP'), disableTop: parser.getBoolean('DISABLE_TOP'),
serverExtra: parser.getArray('SERVER_EXTRA'), serverExtra: parser.getString('SERVER_EXTRA'),
locationExtra: parser.getArray('LOCATION_EXTRA'), locationExtra: parser.getString('LOCATION_EXTRA'),
locationExtraPre: parser.getArray('LOCATION_EXTRA_PRE'), locationExtraPre: parser.getString('LOCATION_EXTRA_PRE'),
htpasswd: basicPasswords.length htpasswd: basicPasswords.length
? `/etc/nginx/generated/htpasswd-${domain}` ? `/etc/nginx/generated/htpasswd-${domain}`
: undefined, : undefined,
...@@ -252,9 +252,9 @@ export async function getData( ...@@ -252,9 +252,9 @@ export async function getData(
certsPath: parser.getString('CERTS_PATH') || '/etc/nginx/certs', certsPath: parser.getString('CERTS_PATH') || '/etc/nginx/certs',
sites, sites,
upstreams, upstreams,
httpExtra: parser.getArray('HTTP_EXTRA'), httpExtra: parser.getString('HTTP_EXTRA'),
nginxExtra: parser.getArray('NGINX_EXTRA'), nginxExtra: parser.getString('NGINX_EXTRA'),
httpExtraPre: parser.getArray('HTTP_EXTRA_PRE'), httpExtraPre: parser.getString('HTTP_EXTRA_PRE'),
nginxExtraPre: parser.getArray('NGINX_EXTRA_PRE'), nginxExtraPre: parser.getString('NGINX_EXTRA_PRE'),
}; };
} }
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