diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index b3e325b06792957ed47fb4c0df6b30454d01fef6..521b079b6b93cdb120d0966c44700e1284cd13f4 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -1,5 +1,7 @@ --- +dslproxy: "<CHANGE_ME:hostname>" + soctools_netname: "soctoolsnet" repo: gn43-dsl @@ -18,8 +20,6 @@ nifi_img: "{{repo}}/nifi:{{version}}{{suffix}}" nginx_name: "dsoclab-nginx" nginx_img: "{{repo}}/nginx:{{version}}{{suffix}}" -dslproxy: "arne-centos.cert-labs.uninett.no" - kspass: "Testing003" tspass: "Testing003" @@ -69,7 +69,6 @@ openid_subjkey: preferred_username keycloak_img: "{{repo}}/keycloak:{{version}}{{suffix}}" keycloak_adminpass: "Pass005" -elastic_url: "https://dsoclab-odfe-1:9200" elastic_username: "admin" misp_token: "" misp_url: "" diff --git a/roles/nifi/templates/flow.xml.j2 b/roles/nifi/templates/flow.xml.j2 index 5e498cc6e97ed85d113d4558d3d14d6bad249659..1e988eca9099a5e60a882bc696b702e6380b7268 100644 --- a/roles/nifi/templates/flow.xml.j2 +++ b/roles/nifi/templates/flow.xml.j2 @@ -14808,7 +14808,7 @@ <variable name="misp_token" value="{{ misp_token }}"/> <variable name="misp_url" value="{{ misp_url }}"/> <variable name="maxmind_key" value="{{ maxmind_key }}"/> - <variable name="elastic_url" value="{{ elastic_url }}"/> + <variable name="elastic_url" value="https://{{ dslproxy }};9200"/> <variable name="elastic_username" value="{{ elastic_username }}"/> <variable name="elastic_password" value="{{ odfees_adminpass }}"/> <variable name="misp_ip_first_interval" value="60d"/>