[ATLASPANDA-625] improve iDDS to mount certs in a different directory…

… from configmap
HSF · Jul 23, 2022 · 0631f5f · 0631f5f
1 parent a465aa9
commit 0631f5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/common/lib/idds/common/utils.py b/common/lib/idds/common/utils.py
@@ -146,6 +146,8 @@ def get_rest_host():
     """
     Function to get rest host
     """
+    if "IDDS_HOST" in os.environ:
+        return os.environ.get("IDDS_HOST")
     host = config_get('rest', 'host')
     url_prefix = get_rest_url_prefix()
     while host.endswith("/"):

diff --git a/start-daemon.sh b/start-daemon.sh
@@ -10,10 +10,10 @@ export IDDS_HOME=/opt/idds
 if [ -f /etc/grid-security/hostkey.pem ]; then
     echo "host certificate is already created."
     chmod 600 /etc/grid-security/hostkey.pem
-elif [ -f /opt/idds/configmap/hostkey.pem ]; then
-    echo "mount /opt/idds/configmap/hostkey.pem to /etc/grid-security/hostkey.pem"
-    ln -fs /opt/idds/configmap/hostkey.pem /etc/grid-security/hostkey.pem
-    ln -fs /opt/idds/configmap/hostcert.pem /etc/grid-security/hostcert.pem
+elif [ -f /opt/idds/certs/hostkey.pem ]; then
+    echo "mount /opt/idds/certs/hostkey.pem to /etc/grid-security/hostkey.pem"
+    ln -fs /opt/idds/certs/hostkey.pem /etc/grid-security/hostkey.pem
+    ln -fs /opt/idds/certs/hostcert.pem /etc/grid-security/hostcert.pem
     chmod 600 /etc/grid-security/hostkey.pem
 fi