diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf index 1dc73d030..54d0a466c 100644 --- a/salt/nginx/etc/nginx.conf +++ b/salt/nginx/etc/nginx.conf @@ -1,6 +1,6 @@ {%- from 'vars/globals.map.jinja' import GLOBALS %} +{%- from 'docker/docker.map.jinja' import DOCKER %} {%- set role = grains.id.split('_') | last %} - {%- set influxpass = salt['pillar.get']('secrets:influx_pass') %} {%- set influxauth = ('so:' + influxpass) | base64_encode %} @@ -98,7 +98,7 @@ http { ssl_protocols TLSv1.2; location ~* (^/login/.*|^/js/.*|^/css/.*|^/images/.*) { - proxy_pass http://{{ GLOBALS.manager_ip }}:9822; + proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header x-user-id ""; @@ -115,7 +115,7 @@ http { auth_request /auth/sessions/whoami; auth_request_set $userid $upstream_http_x_kratos_authenticated_identity_id; proxy_set_header x-user-id $userid; - proxy_pass http://{{ GLOBALS.manager_ip }}:9822/; + proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -129,7 +129,7 @@ http { location ~ ^/auth/.*?(whoami|login|logout|settings) { rewrite /auth/(.*) /$1 break; - proxy_pass http://{{ GLOBALS.manager_ip }}:4433; + proxy_pass http://{{ DOCKER.containers['so-kratos'].ip }}:4433; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -186,7 +186,7 @@ http { location /influxdb/ { auth_request /auth/sessions/whoami; rewrite /influxdb/api/(.*) /api/$1 break; - proxy_pass https://{{ GLOBALS.manager_ip }}:8086/; + proxy_pass https://{{ DOCKER.containers['so-influxdb'].ip }}:8086/; proxy_read_timeout 300; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -200,7 +200,7 @@ http { location /kibana/ { auth_request /auth/sessions/whoami; rewrite /kibana/(.*) /$1 break; - proxy_pass http://{{ GLOBALS.manager_ip }}:5601/; + proxy_pass http://{{ DOCKER.containers['so-kibana'].ip }}:5601/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -209,24 +209,10 @@ http { proxy_set_header Proxy ""; proxy_set_header X-Forwarded-Proto $scheme; } - - location /nodered/ { - auth_request /auth/sessions/whoami; - proxy_pass http://{{ GLOBALS.manager_ip }}:1880/; - proxy_read_timeout 90; - proxy_connect_timeout 90; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Proxy ""; - proxy_set_header X-Forwarded-Proto $scheme; - } - + location /playbook/ { auth_request /auth/sessions/whoami; - proxy_pass http://{{ GLOBALS.manager_ip }}:3200/playbook/; + proxy_pass http://{{ DOCKER.containers['so-playbook'].ip }}:3000/playbook/; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -239,7 +225,7 @@ http { location /soctopus/ { auth_request /auth/sessions/whoami; - proxy_pass http://{{ GLOBALS.manager_ip }}:7000/; + proxy_pass http://{{ DOCKER.containers['so-soctopus'].ip }}:7000/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -261,7 +247,7 @@ http { if ($http_authorization = "") { return 403; } - proxy_pass http://{{ GLOBALS.manager_ip }}:9822/; + proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822/; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header x-user-id "";