mirror of
https://github.com/MatthewL246/pretendo-docker.git
synced 2026-08-28 13:54:09 -05:00
Disable unused and broken nginx SSL support
It was causing timing issues in CI because of mitmproxy's certificate generation. Making this work for real will require compiling nginx from source anyway.
This commit is contained in:
@@ -40,8 +40,6 @@ services:
|
||||
ports:
|
||||
# HTTP
|
||||
- 80:80
|
||||
# HTTPS (supports TLSv1.0 for Wii U)
|
||||
- 443:443
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./config/nginx.conf
|
||||
@@ -54,10 +52,6 @@ services:
|
||||
- type: bind
|
||||
source: ./logs/nginx/
|
||||
target: /var/log/nginx/
|
||||
- type: volume
|
||||
source: mitmproxy-pretendo-data
|
||||
target: /etc/nginx/mitmproxy-certs
|
||||
read_only: true
|
||||
networks:
|
||||
default:
|
||||
internal:
|
||||
|
||||
@@ -13,9 +13,8 @@ http {
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
log_format main '$remote_addr - $remote_user [$time_local] ($ssl_protocol '
|
||||
'$ssl_cipher) $host "$request" $status $body_bytes_sent "$http_referer" '
|
||||
'"$http_user_agent" $request_time';
|
||||
log_format main '$remote_addr - $remote_user [$time_local] $host "$request" $status $body_bytes_sent '
|
||||
'"$http_referer" "$http_user_agent" "$http_x_forwarded_for" $request_time';
|
||||
|
||||
access_log /var/log/nginx/access.log main;
|
||||
access_log /dev/stdout main;
|
||||
@@ -28,12 +27,5 @@ http {
|
||||
|
||||
resolver 127.0.0.11 valid=600s;
|
||||
|
||||
ssl_certificate /etc/nginx/mitmproxy-certs/mitmproxy-ca-cert.pem;
|
||||
ssl_certificate_key /etc/nginx/mitmproxy-certs/mitmproxy-ca.pem;
|
||||
|
||||
# The Wii U needs to connect using TLSv1.0
|
||||
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers DEFAULT:ECDHE-RSA-AES128-SHA:@SECLEVEL=0;
|
||||
|
||||
include /etc/nginx/conf.d/*.conf;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen 443 ssl;
|
||||
server_name account.pretendo.cc c.account.pretendo.cc conntest.pretendo.cc
|
||||
cbvc.cdn.pretendo.cc nasc.pretendo.cc datastore.pretendo.cc api.pretendo.cc
|
||||
assets.pretendo.cc;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen 443 ssl;
|
||||
server_name npdi.cdn.pretendo.cc npdl.cdn.pretendo.cc npfl.c.app.pretendo.cc
|
||||
nppl.c.app.pretendo.cc nppl.app.pretendo.cc npts.app.pretendo.cc;
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen 443 ssl;
|
||||
server_name cdn.pretendo.cc mii.olv.pretendo.cc pretendo-cdn.b-cdn.net;
|
||||
|
||||
set $upstream http://pn-cdn.minio.pretendo.cc;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen 443 ssl default_server;
|
||||
|
||||
location / {
|
||||
return 404;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen 443 ssl;
|
||||
server_name juxt.pretendo.network juxt-test.pretendo.network juxt-dev.pretendo.network
|
||||
portal.olv.pretendo.cc portal-test.olv.pretendo.cc portal-dev.olv.pretendo.cc
|
||||
ctr.olv.pretendo.cc ctr-test.olv.pretendo.cc ctr-dev.olv.pretendo.cc;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen 443 ssl;
|
||||
server_name api.olv.pretendo.cc api-test.olv.pretendo.cc api-dev.olv.pretendo.cc
|
||||
discovery.olv.pretendo.cc discovery-test.olv.pretendo.cc discovery-dev.olv.pretendo.cc;
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ server {
|
||||
# it based on the endpoint it is configured with, and the server calculates it based on the Host header it recieves.
|
||||
# So, if the client send a request using port 9000 but the reverse proxy sends a Host header without a port, the
|
||||
# signature will not match. Limiting the reverse proxy to listen only on default ports fixes this.
|
||||
listen 443 ssl;
|
||||
server_name minio.pretendo.cc pn-cdn.minio.pretendo.cc pn-boss.minio.pretendo.cc super-mario-maker.minio.pretendo.cc;
|
||||
|
||||
set $upstream http://minio:9000;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen 443 ssl;
|
||||
server_name pretendo.cc www.pretendo.cc;
|
||||
|
||||
location / {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen 443 ssl;
|
||||
server_name pretendo.network www.pretendo.network;
|
||||
|
||||
set $upstream http://website:8080;
|
||||
|
||||
Reference in New Issue
Block a user