From 224d422a6018929f7d4aa9bac59928a4f6274f67 Mon Sep 17 00:00:00 2001
From: Arne Oslebo <arne.oslebo@uninett.no>
Date: Sun, 6 Dec 2020 16:28:44 +0100
Subject: [PATCH] small fix for misp integration
---
group_vars/all/main.yml | 4 ++--
roles/build/templates/misp/Dockerfile.j2 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 1e3f019..28c551b 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -106,7 +106,7 @@ odfeplugin_version: "1.4.0.0"
openid_realm: "SOCTOOLS1"
openid_scope: profile
-openid_subjkey: email
+openid_subjkey: preferred_username
keycloak_img: "{{repo}}/keycloak:{{version}}{{suffix}}"
keycloak_adminpass: "Pass005"
@@ -122,4 +122,4 @@ misp_dbpass: "Pass007"
# misp_salt generated with: openssl rand -base64 32
misp_salt: "wa2fJA2mGIn32IDl+uKrCJ069Mg3khDdGzFNv8DOwM0="
misp_odic_crypto_pass: 1234567890 #TODO: Generate dynamically
-misp_crypto_pass: 1234567890 #TODO: Generate dynamically
\ No newline at end of file
+misp_crypto_pass: 1234567890 #TODO: Generate dynamically
diff --git a/roles/build/templates/misp/Dockerfile.j2 b/roles/build/templates/misp/Dockerfile.j2
index 4b7b6c9..28f5bc8 100644
--- a/roles/build/templates/misp/Dockerfile.j2
+++ b/roles/build/templates/misp/Dockerfile.j2
@@ -84,5 +84,5 @@ EXPOSE 80 443 6443 6379 6666 50000
ENV PATH "$PATH:/opt/rh/rh-php72/root/bin/"
COPY mispsupervisord.conf /etc/supervisord.conf
-#ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
+#ENTRYPOINT ["/bin/bash"]
--
GitLab