From 838252090822f9e8e8c1eac4ff9538f3fbcacb1a Mon Sep 17 00:00:00 2001
From: Arne Oslebo <arne.oslebo@uninett.no>
Date: Fri, 26 Jun 2020 10:26:44 +0200
Subject: [PATCH] removed duplicate configuration variable
---
group_vars/all/main.yml | 5 ++---
roles/nifi/templates/flow.xml.j2 | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index b3e325b..521b079 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 5e498cc..1e988ec 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"/>
--
GitLab