H-O-O-T-S/Open-RSC-Docker-Home
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes to support new design

Browse Source
This commit is contained in:
Marwolf
2018-08-18 12:12:37 -04:00
parent b8c12d935f
commit 3c7a2da359
7 changed files with 43 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
etc/nginx/HTTPS_default.conf.BAK
View File

@@ -17,41 +17,6 @@ server {
rewrite ^ https://$http_host$request_uri? permanent; #Redirect traffic to HTTPS
root /app;
index index.html index.htm index.php index.jsp;
client_max_body_size 100M;
location / {
try_files $uri $uri/index.html;
}
####### Proxies #######
# PHP proxy
location ~ \.php$ {
fastcgi_pass php:9001;
fastcgi_index index.php;
include fastcgi.conf;
}
# Ghost proxy
location /blog {
proxy_pass http://ghost;
proxy_set_header Host $http_host; # required for docker client's sake
proxy_set_header X-Real-IP $remote_addr; # pass on real client's IP
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 900;
}
# Tomcat proxy
location ~ \.(do|jspa|obr|jsp|txt|zip) {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://tomcat;
}
}
# HTTPS
@@ -77,20 +42,21 @@ server {
ssl_trusted_certificate /etc/letsencrypt/live/${NGINX_HOST}/chain.pem;
root /app;
index index.html index.htm index.php index.jsp;
index index.jsp index.html index.htm index.php;
client_max_body_size 100M;
location / {
try_files $uri $uri/index.html;
try_files $uri $uri/ =404;
}
####### Proxies #######
# PHP proxy
location ~ \.php$ {
fastcgi_pass php:9001;
fastcgi_index index.php;
include fastcgi.conf;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://php;
}
# Ghost proxy
@@ -104,7 +70,7 @@ server {
}
# Tomcat proxy
location ~ \.(do|jspa|obr|jsp|txt|zip) {
location ~ \.jsp$ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

8
etc/nginx/nginx.conf
View File

@@ -15,15 +15,13 @@ server {
error_log /opt/bitnami/nginx/logs/error.log;
access_log /opt/bitnami/nginx/logs/access.log;
#rewrite ^ https://$http_host$request_uri? permanent; #Redirect traffic to HTTPS
root /app;
index index.html index.htm index.php index.jsp;
index index.jsp index.html index.htm index.php;
client_max_body_size 100M;
location / {
try_files $uri $uri/index.html;
try_files $uri $uri/ =404;
}
####### Proxies #######
@@ -45,7 +43,7 @@ server {
}
# Tomcat proxy
location ~ \.(do|jspa|obr|jsp|txt|zip) {
location ~ \.jsp$ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;