jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

nginx: refactor the config

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-04-24 21:13:01 +02:00
parent 90b5d240a8
commit 2e38e1a79c
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/nginxconfig.ejs
View File

@@ -326,13 +326,6 @@ server {
}
<% } %>
<% } else { %>
location / {
proxy_pass http://<%= ip %>:<%= port %>;
}
<% } %>
<% if (proxyAuth.enabled) { %>
# workaround caching issue after /logout. if max-age is set, browser uses cache and user thinks they have not logged out
# IMPORTANT: have to keep all the add_headers at top level here to avoid repeating all the add_headers and proxy_set_headers in location block
proxy_hide_header Cache-Control;
@@ -344,6 +337,11 @@ server {
proxy_set_header X-Remote-User $user;
proxy_set_header X-Remote-Email $email;
proxy_set_header X-Remote-Name $name;
<% } else { %>
location / {
proxy_pass http://<%= ip %>:<%= port %>;
}
<% } %>
<% } else if ( endpoint === 'redirect' ) { %>
@@ -393,18 +391,7 @@ server {
proxy_ssl_verify off;
proxy_pass $upstream;
}
<% } else { %>
location / {
# without a variable, nginx will not start if upstream is down or unavailable
resolver 127.0.0.1 valid=30s;
set $upstream <%= upstreamUri %>;
proxy_ssl_verify off;
proxy_pass $upstream;
}
<% } %>
<% if (proxyAuth.enabled) { %>
# workaround caching issue after /logout. if max-age is set, browser uses cache and user thinks they have not logged out
# IMPORTANT: have to keep all the add_headers at top level here to avoid repeating all the add_headers and proxy_set_headers in location block
proxy_hide_header Cache-Control;
@@ -416,7 +403,18 @@ server {
proxy_set_header X-Remote-User $user;
proxy_set_header X-Remote-Email $email;
proxy_set_header X-Remote-Name $name;
<% } else { %>
location / {
# without a variable, nginx will not start if upstream is down or unavailable
resolver 127.0.0.1 valid=30s;
set $upstream <%= upstreamUri %>;
proxy_ssl_verify off;
proxy_pass $upstream;
}
<% } %>
<% } else if ( endpoint === 'ip' ) { %>
location /notfound.html {
root <%= sourceDir %>/dashboard/dist;