Commit fb6ff091 authored by EKbfh's avatar EKbfh

Merge branch 'fix-datastream-nbi' into 'microservices'

Fix datastream nbi

See merge request !40
parents 1a3987e9 3b61e637
Pipeline #9307 failed with stages
in 171 minutes and 55 seconds
......@@ -34,7 +34,8 @@ forms:
- critial
whitelist_access:
type: text
label: "Restrict access to service from IPs:"
default: ""
label: "Allow access to service from IPs:"
common: environment
description: "in CIDR notation, separated with comma"
......
......@@ -27,7 +27,8 @@ forms:
- critial
whitelist_access:
type: text
label: "Restrict access to service from IPs:"
default: ""
label: "Allow access to service from IPs:"
common: environment
description: "in CIDR notation, separated with comma"
......
......@@ -251,7 +251,7 @@ server {
location /api/datastream/ {
proxy_pass http://datastream;
auth_request /api/auth/auth/;
{% if datastream_whitelist_access and datastream_whitelist_access is defined %}
{% if datastream_whitelist_access and datastream_whitelist_access is defined and 'svc-datastream-exec' in groups and groups['svc-datastream-exec'] | length > 0 %}
include allow_ip_datastream.conf;
{% endif %}
# internal;
......@@ -274,7 +274,7 @@ server {
location /api/nbi/ {
proxy_pass http://nbi;
auth_request /api/auth/auth/;
{% if nbi_whitelist_access and nbi_whitelist_access is defined %}
{% if nbi_whitelist_access and nbi_whitelist_access is defined and 'svc-nbi-exec' in groups and groups['svc-nbi-exec'] | length > 0 %}
include allow_ip_nbi.conf;
{% endif %}
# internal;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment