From 5fa66bd1357c4a8f0d489e8f9fbc2acd80753b8b Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Thu, 20 Sep 2018 00:14:35 +0200
Subject: [PATCH] Minor naming fixes in midPoint dockerization

---
 midpoint/docker-compose.yml                      | 16 +++++++---------
 .../container_files/usr-local-bin/entrypoint.sh  |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/midpoint/docker-compose.yml b/midpoint/docker-compose.yml
index d0b435d..1a6d7e7 100644
--- a/midpoint/docker-compose.yml
+++ b/midpoint/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     networks:
      - back
     volumes:
-     - midpoint_mysql:/var/lib/mysql
+     - midpoint_data:/var/lib/mysql
 
   midpoint-server:
     build: ./midpoint-server/
@@ -45,21 +45,19 @@ services:
     secrets:
      - m_database_password.txt
      - m_keystore_password.txt
-     - source: m_sp-key.pem
-       target: shib_sp-key.pem
-     - source: m_host-key.pem
-       target: host-key.pem
+     - m_sp-key.pem
+     - m_host-key.pem
     volumes:
      - midpoint_home:/opt/midpoint/var
-     - type: bind
-       source: ./configs-and-secrets/midpoint/shibboleth/sp-cert.pem
-       target: /etc/shibboleth/sp-cert.pem
      - type: bind
        source: ./configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
        target: /etc/shibboleth/shibboleth2.xml
      - type: bind
        source: ./configs-and-secrets/midpoint/shibboleth/idp-metadata.xml
        target: /etc/shibboleth/idp-metadata.xml
+     - type: bind
+       source: ./configs-and-secrets/midpoint/shibboleth/sp-cert.pem
+       target: /etc/shibboleth/sp-cert.pem
      - type: bind
        source: ./configs-and-secrets/midpoint/httpd/host-cert.pem
        target: /etc/pki/tls/certs/host-cert.pem
@@ -82,5 +80,5 @@ secrets:
     file: ./configs-and-secrets/midpoint/application/keystore_password.txt
     
 volumes:
-  midpoint_mysql:
+  midpoint_data:
   midpoint_home:
diff --git a/midpoint/midpoint-server/container_files/usr-local-bin/entrypoint.sh b/midpoint/midpoint-server/container_files/usr-local-bin/entrypoint.sh
index a275bd2..446fc2a 100755
--- a/midpoint/midpoint-server/container_files/usr-local-bin/entrypoint.sh
+++ b/midpoint/midpoint-server/container_files/usr-local-bin/entrypoint.sh
@@ -5,8 +5,8 @@ export ENV=${ENV//[; ]/_}
 export USERTOKEN=${USERTOKEN//[; ]/_}
 
 echo "Linking secrets and config files; using authentication: $AUTHENTICATION"
-ln -sf /run/secrets/shib_sp-key.pem /etc/shibboleth/sp-key.pem
-ln -sf /run/secrets/host-key.pem /etc/pki/tls/private/host-key.pem
+ln -sf /run/secrets/m_sp-key.pem /etc/shibboleth/sp-key.pem
+ln -sf /run/secrets/m_host-key.pem /etc/pki/tls/private/host-key.pem
 ln -sf /etc/httpd/conf.d/midpoint.conf.auth.$AUTHENTICATION /etc/httpd/conf.d/midpoint.conf
 
 httpd-shib-foreground &