Commit c5c0153b authored by nanahira's avatar nanahira

missing

parent 9164b6aa
Pipeline #39289 passed with stages
in 41 minutes and 2 seconds
...@@ -26,6 +26,7 @@ export interface SiteRenderData { ...@@ -26,6 +26,7 @@ export interface SiteRenderData {
disableTop?: boolean; disableTop?: boolean;
serverExtra?: string[]; serverExtra?: string[];
locationExtra?: string[]; locationExtra?: string[];
locationExtraPre?: string[];
htpasswd?: string; htpasswd?: string;
cors?: boolean; cors?: boolean;
} }
...@@ -58,6 +59,7 @@ export interface PhpRenderData extends FileRenderData { ...@@ -58,6 +59,7 @@ export interface PhpRenderData extends FileRenderData {
php: true; php: true;
upstream: string; upstream: string;
phpExtra?: string[]; phpExtra?: string[];
phpExtraPre?: string[];
} }
export interface RedirectRenderData extends SiteRenderData { export interface RedirectRenderData extends SiteRenderData {
...@@ -168,6 +170,7 @@ async function getSiteData( ...@@ -168,6 +170,7 @@ async function getSiteData(
expires: parser.getString('EXPIRES') || '10m', expires: parser.getString('EXPIRES') || '10m',
upstream: targetUrl.host, upstream: targetUrl.host,
phpExtra: parser.getArray('PHP_EXTRA'), phpExtra: parser.getArray('PHP_EXTRA'),
phpExtraPre: parser.getArray('PHP_EXTRA_PRE'),
} as PhpRenderData; } as PhpRenderData;
} else if (targetUrl.protocol.startsWith('redirect+')) { } else if (targetUrl.protocol.startsWith('redirect+')) {
specificRenderData = { specificRenderData = {
...@@ -218,6 +221,7 @@ async function getSiteData( ...@@ -218,6 +221,7 @@ async function getSiteData(
disableTop: parser.getBoolean('DISABLE_TOP'), disableTop: parser.getBoolean('DISABLE_TOP'),
serverExtra: parser.getArray('SERVER_EXTRA'), serverExtra: parser.getArray('SERVER_EXTRA'),
locationExtra: parser.getArray('LOCATION_EXTRA'), locationExtra: parser.getArray('LOCATION_EXTRA'),
locationExtraPre: parser.getArray('LOCATION_EXTRA_PRE'),
htpasswd: basicPasswords.length htpasswd: basicPasswords.length
? `/etc/nginx/generated/htpasswd-${domain}` ? `/etc/nginx/generated/htpasswd-${domain}`
: undefined, : undefined,
......
...@@ -231,6 +231,9 @@ http { ...@@ -231,6 +231,9 @@ http {
{{/serverExtra}} {{/serverExtra}}
location / { location / {
{{#locationExtraPre}}
{{.}}
{{/locationExtraPre}}
{{#proxy}} {{#proxy}}
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Forwarded "for=$remote_addr;by=$hostname"; proxy_set_header Forwarded "for=$remote_addr;by=$hostname";
...@@ -306,6 +309,9 @@ http { ...@@ -306,6 +309,9 @@ http {
{{#php}} {{#php}}
location ~ \.php$ { location ~ \.php$ {
{{#phpExtraPre}}
{{.}}
{{/phpExtraPre}}
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass {{upstream}}; fastcgi_pass {{upstream}};
fastcgi_index {{index}}; fastcgi_index {{index}};
......
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