refactor: only add ARANGO SSL env variables to .env file if generate_env is called with ssl flag.

Author: JoshuaSBrown

compose/README.md

@@ -62,9 +62,14 @@ the ArangoDB container can mount it and locate the necessary certificate files.
 If not using SSL with Arango, omit this flag so that the container will run
 over TCP (HTTP).
 
-WARNING - If you do not want to run with HTTPS be sure to remove
-datafed-arango.key, datafed-arango.pem, datafed-arango.crt from
-(DataFed/compose/metadata|all/keys) folder.
+WARNING - If you do not want to run with HTTPS but it was previously run with
+HTTPS turned on, be sure to remove datafed-arango.key, datafed-arango.pem,
+datafed-arango.crt from (DataFed/compose/metadata|all/keys) folder. In
+addition, you may need to remove, the below variables from your .env file
+
+   DATAFED_ARANGO_CERT_PATH
+   DATAFED_ARANGO_KEY_PATH
+   DATAFED_ARANGO_PEM_PATH
 
 ### 2. Fill in the needed .env variables for the Metadata Core Services
 

compose/all/compose.yml

@@ -158,10 +158,6 @@ services:
             - ./logs:${DATAFED_CONTAINER_LOG_PATH}
             - ${DATAFED_HOST_COLLECTION_MOUNT}:${DATAFED_GCS_COLLECTION_ROOT_PATH}/${DATAFED_REPO_ID_AND_DIR}
 
-              #    ports:
-              #      - "8081:443" # This must be the same port that is mapped to the host for redirects to work
-              #      - "50000-50100:50000-50100"
-
 volumes:
     foxx_tmp:
     arango_db:

docker/entrypoint_foxx.sh

@@ -42,7 +42,7 @@ fi
 # we may want to keep the existing state and not overwrite the database.
 install_flag="/tmp/.foxx_is_installed"
 if [ ! -f "$install_flag" ]; then
-  echo "Installing foxx."
+  echo "INFO - Installing foxx."
   log_path="$DATAFED_DEFAULT_LOG_PATH"
   if [ ! -d "${log_path}" ]; then
     mkdir -p "${log_path}" datafed
@@ -81,9 +81,6 @@ if [ ! -f "$install_flag" ]; then
 
   "${DATAFED_DEPENDENCIES_INSTALL_PATH}/bin/cmake" --build build
 
-  # Give arango container a minute to initialize
-  # should be replaced with health check at some point
-  sleep 5
   "${DATAFED_DEPENDENCIES_INSTALL_PATH}/bin/cmake" --build build --target install
 
   if [ "$ENABLE_FOXX_TESTS" == "TRUE" ]; then
@@ -97,11 +94,12 @@ if [ ! -f "$install_flag" ]; then
   # Create flag to indicate container has done its job
   touch "$install_flag"
 else
-  echo "$install_flag has been found skipping reinstall"
+  echo "INFO - $install_flag has been found skipping reinstall"
 fi
 
 # Keep container alive for a little bit, the CI pipelines check that the
 # container actually runs. If the container runs to fast the pipeline check
 # might fail because it wasn't able to determine if the container actually
 # ran.
 sleep 60
+echo "INFO - Initialization of Database has completed successfully."

scripts/compose_generate_env.sh

@@ -312,14 +312,24 @@ DATAFED_GLOBUS_APP_ID=${local_DATAFED_GLOBUS_APP_ID}
 DATAFED_ZEROMQ_SESSION_SECRET=${local_DATAFED_ZEROMQ_SESSION_SECRET}
 DATAFED_WEB_CERT_PATH=${local_DATAFED_WEB_CERT_PATH}
 DATAFED_WEB_KEY_PATH=${local_DATAFED_WEB_KEY_PATH}
-DATAFED_ARANGO_CERT_PATH=${local_DATAFED_ARANGO_CERT_PATH}
-DATAFED_ARANGO_KEY_PATH=${local_DATAFED_ARANGO_KEY_PATH}
-DATAFED_ARANGO_PEM_PATH=${local_DATAFED_ARANGO_PEM_PATH}
 DATAFED_DATABASE_PASSWORD=${local_DATAFED_DATABASE_PASSWORD}
 DATAFED_DATABASE_IP_ADDRESS=${local_DATAFED_DATABASE_IP_ADDRESS}
 DATAFED_DATABASE_PORT=${local_DATAFED_DATABASE_PORT}
 DATAFED_ENABLE_FOXX_TESTS=${local_DATAFED_ENABLE_FOXX_TESTS}
 EOF
+
+  if [[ -n "${local_DATAFED_ARANGO_KEY_PATH}" || "${ARANGO_USE_SSL}" == "TRUE" ]]
+  then
+      echo "DATAFED_ARANGO_KEY_PATH=${local_DATAFED_ARANGO_KEY_PATH}" >> $ENV_FILE_PATH
+  fi
+  if [[ -n "${local_DATAFED_ARANGO_CERT_PATH}" || "${ARANGO_USE_SSL}" == "TRUE" ]]
+  then
+      echo "DATAFED_ARANGO_CERT_PATH=${local_DATAFED_ARANGO_CERT_PATH}" >> $ENV_FILE_PATH
+  fi
+  if [[ -n "${local_DATAFED_ARANGO_PEM_PATH}" || "${ARANGO_USE_SSL}" == "TRUE" ]]
+  then
+      echo "DATAFED_ARANGO_PEM_PATH=${local_DATAFED_ARANGO_PEM_PATH}" >> $ENV_FILE_PATH
+  fi
 fi
 
 if [ "${BUILD_REPO}" == "TRUE" ]; then