Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: docker nginx config #9931

Merged
merged 1 commit into from
Mar 15, 2024
Merged

fix: docker nginx config #9931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions conf/nginx-docker/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

# we need to have main domain for CORS (see nginx-cors includes)
map $host $main_domain {
default ...;
~*.*\.(?<host_main_domain>[^.]+\.[^.]+) $host_main_domain;
default ...;
~*.*\.(?<host_main_domain>[^.]+\.[^.]+) $host_main_domain;
}

include /etc/nginx/snippets/expires-no-json-xml.conf;
Expand All @@ -29,7 +29,10 @@ server {
# Product Opener needs a root domain + a wildcard for all subdomains
server_name ${PRODUCT_OPENER_DOMAIN} *.${PRODUCT_OPENER_DOMAIN};

access_log /var/log/nginx/${productopener_access_file_prefix}access.log;
# logs location: default is static-off, will be changed to proxy-off
# for requests passed to Apache
access_log /var/log/nginx/static-off-access.log;
error_log /var/log/nginx/static-off-error.log;

# static file we serve are in html/
root /opt/product-opener/html/;
Expand All @@ -41,13 +44,6 @@ server {
# Add index.php to the list if you are using PHP
index index.html index.htm index.nginx-debian.html;

location /data/ {
include /etc/nginx/snippets/off.cors-headers.include;
# First attempt to serve request as file, then
# as directory, then fall back to displaying a 404.
try_files $uri $uri/ =404;
}

# Add index.php to the list if you are using PHP
index index.html index.htm index.nginx-debian.html;

Expand All @@ -62,7 +58,7 @@ server {

# Static files are served directly by NGINX

location ~ ^/files/(.*) {
location ~ ^/(.well-known|files|data|exports|dump)/ {
include snippets/off.cors-headers.include;
include /etc/nginx/snippets/expiry-headers.include;
# fist try in files_resources
Expand All @@ -71,7 +67,7 @@ server {
gunzip on;
}

location ~ ^/(.well-known|images|fonts|css|js|rss|resources|foundation|bower_components)/ {
location ~ ^/(images|fonts|css|js|donate|resources)/ {
include /etc/nginx/snippets/off.cors-headers.include;
include /etc/nginx/snippets/expiry-headers.include;
# First attempt to serve request as file, off_web_html acting as an override,
Expand All @@ -96,7 +92,7 @@ server {
}

# redirects of some locations
include /etc/nginx/snippets/off.locations-redirects.include;
include /etc/nginx/snippets/off.locations-redirects.include;

# Dynamically generated files and CGI scripts are passed
# to the Apache + mod_perl server running on the backend container
Expand All @@ -112,8 +108,10 @@ server {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
access_log /var/log/nginx/proxy-off-access.log;
error_log /var/log/nginx/proxy-off-error.log;
set $backend backend;
proxy_pass http://$backend/cgi/display.pl?$request_uri;
proxy_pass http://$backend/cgi/display.pl?$request_uri;
}

location /nginx_status {
Expand All @@ -127,7 +125,9 @@ server {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
access_log /var/log/nginx/proxy-off-access.log;
error_log /var/log/nginx/proxy-off-error.log;
set $backend backend;
proxy_pass http://$backend;
proxy_pass http://$backend;
}
}
54 changes: 27 additions & 27 deletions conf/nginx/sites-available/obf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ server {
# listen 80 default_server;
# listen [::]:80 default_server;

listen 80;
listen [::]:80;
listen 80;
listen [::]:80;


server_name openbeautyfacts.org *.openbeautyfacts.org ;
Expand All @@ -40,29 +40,29 @@ server {
listen [::]:443 http2 ssl;

include snippets/ssl.openbeautyfacts.org;
include snippets/ssl-params.conf;
include snippets/ssl-params.conf;

root /srv/obf/html;

access_log /srv/obf/logs/nginx.access2.log;
error_log /srv/obf/logs/nginx.error2.log;

# Redirect GET requests to https. POST requests will be transformed
# to GET by most browsers when redirected, and it breaks apps that
# use the API through http.

if ($scheme = http) {
set $test "A";
}
if ($request_uri !~ "/api/") {
set $test "${test}B";
}
if ($request_method = GET) {
set $test "${test}C";
}
if ($test = ABC) {
return 301 https://$host$request_uri;
}
# Redirect GET requests to https. POST requests will be transformed
# to GET by most browsers when redirected, and it breaks apps that
# use the API through http.

if ($scheme = http) {
set $test "A";
}
if ($request_uri !~ "/api/") {
set $test "${test}B";
}
if ($request_method = GET) {
set $test "${test}C";
}
if ($test = ABC) {
return 301 https://$host$request_uri;
}

gzip on;
gzip_min_length 1000;
Expand Down Expand Up @@ -107,14 +107,14 @@ server {
try_files $uri $uri/ =404;
}

# GoogleAssociationService made 2500 requests/min to assetlinks.json
# and much less when caching headers are sent
location = /.well-known/assetlinks.json {
include snippets/off.cors-headers.include;
include snippets/expiry-headers.include;
expires 1d;
try_files $uri $uri/ =404;
}
# GoogleAssociationService made 2500 requests/min to assetlinks.json
# and much less when caching headers are sent
location = /.well-known/assetlinks.json {
include snippets/off.cors-headers.include;
include snippets/expiry-headers.include;
expires 1d;
try_files $uri $uri/ =404;
}

location / {
proxy_set_header Host $host;
Expand Down
12 changes: 6 additions & 6 deletions conf/nginx/sites-available/off
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ server {

root /srv/off/html;

# enable large uploads
client_max_body_size 20M;
# enable large uploads
client_max_body_size 20M;
client_body_timeout 120s;
client_header_timeout 120s;

Expand Down Expand Up @@ -115,8 +115,8 @@ server {
# recursive hosts as we are proxying behind a proxy
set_real_ip_from 10.0.0.0/8;
real_ip_recursive on;
access_log /var/log/nginx/proxy-off-access.log proxied_requests buffer=256K flush=1s;
error_log /var/log/nginx/proxy-off-error.log;
access_log /var/log/nginx/proxy-off-access.log proxied_requests buffer=256K flush=1s;
error_log /var/log/nginx/proxy-off-error.log;

proxy_pass http://127.0.0.1:8004/cgi/display.pl?;
}
Expand All @@ -126,8 +126,8 @@ server {
# recursive hosts as we are proxying behind a proxy
set_real_ip_from 10.0.0.0/8;
real_ip_recursive on;
access_log /var/log/nginx/proxy-off-access.log proxied_requests buffer=256K flush=1s;
error_log /var/log/nginx/proxy-off-error.log;
access_log /var/log/nginx/proxy-off-access.log proxied_requests buffer=256K flush=1s;
error_log /var/log/nginx/proxy-off-error.log;

proxy_pass http://127.0.0.1:8004;
}
Expand Down
4 changes: 2 additions & 2 deletions conf/nginx/sites-available/off-pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ server {
set_real_ip_from 10.0.0.0/8;
real_ip_recursive on;
access_log /var/log/nginx/proxy-off-access.log proxied_requests buffer=256K flush=1s;
error_log /var/log/nginx/proxy-off-error.log;
error_log /var/log/nginx/proxy-off-error.log;

proxy_pass http://127.0.0.1:8014/cgi/display.pl?;
}
Expand All @@ -103,7 +103,7 @@ server {
set_real_ip_from 10.0.0.0/8;
real_ip_recursive on;
access_log /var/log/nginx/proxy-off-access.log proxied_requests buffer=256K flush=1s;
error_log /var/log/nginx/proxy-off-error.log;
error_log /var/log/nginx/proxy-off-error.log;

proxy_pass http://127.0.0.1:8014;
}
Expand Down
Loading