Mirrors/monolithic
2
0
Fork 0
mirror of https://github.com/lancachenet/monolithic synced 2024-11-21 19:43:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Completed refactor of upstream proxy

Browse source 
Refactored upstream proxy into lancache standard structure.
Simplified both location blocks into a single file rather than further
delegated folders
This commit is contained in:
VibroAxe 2022-08-28 11:04:32 +01:00
parent 0026cdabf3
commit a27bb4d77c
10 changed files with 47 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -34,7 +34,7 @@ RUN rm /etc/nginx/sites-enabled/* /etc/nginx/stream-enabled/* ;\
chown -R ${WEBUSER}:${WEBUSER} /data/ ;\
mkdir -p /etc/nginx/sites-enabled ;\
ln -s /etc/nginx/sites-available/10_cache.conf /etc/nginx/sites-enabled/10_generic.conf; \
ln -s /etc/nginx/sites-available/upstream.conf /etc/nginx/sites-enabled/upstream.conf; \
ln -s /etc/nginx/sites-available/20_upstream.conf /etc/nginx/sites-enabled/20_upstream.conf; \
ln -s /etc/nginx/stream-available/10_sni.conf /etc/nginx/stream-enabled/10_sni.conf
RUN mkdir -m 755 -p /data/cachedomains ;\

2
overlay/etc/nginx/sites-available/10_cache.conf
View file

@ -1,3 +1,5 @@
# Primary monolithic cache engine
server {
listen 80 reuseport;

17
overlay/etc/nginx/sites-available/20_upstream.conf Normal file
View file

@ -0,0 +1,17 @@
# Upstream server to proxy and handle inconsistent 302 redirects
# All cache traffic is passed through this proxy to allow rewriting of redirects without caching
# This is particularly important for sony / ps5 as upstreams redirect between them which confuses slice map on caching
server {
# Internal bind on 3128, this should not be externally mapped
listen localhost:3128 reuseport;
# No access_log tracking as all requests to this instance are already logged through monolithic
# access_log /data/logs/upstream-access.log cachelog;
error_log /data/logs/upstream-error.log;
include /etc/nginx/sites-available/upstream.conf.d/*.conf;
}

2
overlay/etc/nginx/sites-available/cache.conf.d/root/90_upstream.conf
View file

@ -1,6 +1,8 @@
# Upstream Configuration
proxy_next_upstream error timeout http_404;
# proxy_pass http://$host$request_uri;
# Proxy into the redirect handler
proxy_pass http://127.0.0.1:3128$request_uri;
proxy_redirect off;

23
overlay/etc/nginx/sites-available/upstream.conf
View file

@ -1,23 +0,0 @@
server {
listen 3128 reuseport;
set $orig_loc 'upstream';
# access_log /data/logs/upstream-access.log cachelog;
error_log /data/logs/upstream-error.log;
resolver UPSTREAM_DNS ipv6=off;
location / {
proxy_pass http://$host$request_uri;
proxy_intercept_errors on;
error_page 301 302 307 = @upstream_redirect;
}
location @upstream_redirect {
set $saved_upstream_location '$upstream_http_location';
set $orig_loc 'upstream-302';
proxy_pass $saved_upstream_location;
}
}

2
overlay/etc/nginx/sites-available/upstream.conf.d/10_resolver.conf Normal file
View file

@ -0,0 +1,2 @@
resolver UPSTREAM_DNS ipv6=off;

2
overlay/etc/nginx/sites-available/upstream.conf.d/20_tracking.conf Normal file
View file

@ -0,0 +1,2 @@
# Header to track if resolved from upstream or 302 redirect
set $orig_loc 'upstream';

9
overlay/etc/nginx/sites-available/upstream.conf.d/30_primary_proxy.conf Normal file
View file

@ -0,0 +1,9 @@
# Proxy all requests to upstream
location / {
# Simple proxy the request
proxy_pass http://$host$request_uri;
# Catch the errors to process the redirects
proxy_intercept_errors on;
error_page 301 302 307 = @upstream_redirect;
}

11
overlay/etc/nginx/sites-available/upstream.conf.d/40_redirect_proxy.conf Normal file
View file

@ -0,0 +1,11 @@
# Special location block to handle 302 redirects
location @upstream_redirect {
# Upstream_http_location contains the Location: redirection from the upstream server
set $saved_upstream_location '$upstream_http_location';
# Set debug header
set $orig_loc 'upstream-302';
# Pass to proxy and reproxy the request
proxy_pass $saved_upstream_location;
}

2
overlay/hooks/entrypoint-pre.d/10_setup.sh
View file

@ -17,5 +17,5 @@ sed -i "s/CACHE_MAX_AGE/${CACHE_MAX_AGE}/" /etc/nginx/conf.d/20_proxy_cache_path
sed -i "s/CACHE_MAX_AGE/${CACHE_MAX_AGE}/" /etc/nginx/sites-available/cache.conf.d/root/20_cache.conf
sed -i "s/slice 1m;/slice ${CACHE_SLICE_SIZE};/" /etc/nginx/sites-available/cache.conf.d/root/20_cache.conf
sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/" /etc/nginx/sites-available/cache.conf.d/10_root.conf
sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/" /etc/nginx/sites-available/upstream.conf.d/10_resolver.conf
sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/" /etc/nginx/stream-available/10_sni.conf
sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/" /etc/nginx/sites-available/upstream.conf