From 62b9e7dbb4fd1b4c9203cbcc7b5e9a75216f7b31 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 15 Dec 2020 16:29:49 +0100 Subject: [PATCH] Revert "secure.conf" This reverts commit 0fc78481b5d9681f92d4d9028dba8ee5abfeede7. --- docker/nginx/conf.d/client.conf | 16 ++++++++-------- docker/nginx/conf.d/secure.conf | 9 --------- 2 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 docker/nginx/conf.d/secure.conf diff --git a/docker/nginx/conf.d/client.conf b/docker/nginx/conf.d/client.conf index 6ce53a8b..84157da3 100644 --- a/docker/nginx/conf.d/client.conf +++ b/docker/nginx/conf.d/client.conf @@ -347,20 +347,20 @@ server { proxy_pass http://127.0.0.1/$uri?attachment=true&$args; } - # location /secure { - # rewrite /secure/(.*) /$1 break; - # proxy_pass http://oathkeeper:4455; - # } + location /secure { + rewrite /secure/(.*) /$1 break; + proxy_pass http://oathkeeper:4455; + } #location /secure/self-service { # rewrite /secure/self-service/(.*) /$1 break; # proxy_pass http://oathkeeper:4455; #} - # location /accounts { - # rewrite /accounts/(.*) /$1 break; - # proxy_pass http://accounts:3000; - # } + location /accounts { + rewrite /accounts/(.*) /$1 break; + proxy_pass http://accounts:3000; + } # include custom locations, specific to the server include /etc/nginx/conf.d/server-override/*; diff --git a/docker/nginx/conf.d/secure.conf b/docker/nginx/conf.d/secure.conf deleted file mode 100644 index 5ad154ce..00000000 --- a/docker/nginx/conf.d/secure.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name secure.siasky.xyz; - - location / { - proxy_pass http://oathkeeper:4455; - } -} \ No newline at end of file