diff --git a/docker-compose.vs.debug.yml b/docker-compose.vs.debug.yml index cf173a8fd..47790d039 100644 --- a/docker-compose.vs.debug.yml +++ b/docker-compose.vs.debug.yml @@ -1,6 +1,12 @@ version: "3.7" services: + nginx: + ports: + - "80:80" + volumes: + - ./ops/nginx/conf.d.dev:/etc/nginx/conf.d:ro + api: build: target: build diff --git a/ops/nginx/conf.d.dev/filterlists.conf b/ops/nginx/conf.d.dev/filterlists.conf new file mode 100644 index 000000000..f5921c051 --- /dev/null +++ b/ops/nginx/conf.d.dev/filterlists.conf @@ -0,0 +1,29 @@ +# https://github.com/collinbarrett/FilterLists +server { + listen 80 default_server; + + include svr-includes/*; + + location ^~ /api { + rewrite ^/api/(.*)$ /$1 break; + proxy_pass http://api:80; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection keep-alive; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location / { + proxy_pass http://web:80; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection keep-alive; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} \ No newline at end of file diff --git a/ops/nginx/conf.d/filterlists.conf b/ops/nginx/conf.d/filterlists.conf index 391d65fc4..7021f9cdd 100644 --- a/ops/nginx/conf.d/filterlists.conf +++ b/ops/nginx/conf.d/filterlists.conf @@ -34,7 +34,7 @@ server { # Redirect http to https server { - listen 80; + listen 80 default_server; server_name filterlists.com; return 301 https://filterlists.com$request_uri;