Generate passwords only if modules are enabled

ccp/modules/datashield-setup.sh

@@ -3,7 +3,6 @@
 if [ "$ENABLE_DATASHIELD" == true ]; then
   log INFO "DataSHIELD setup detected -- will start DataSHIELD services."
   OVERRIDE+=" -f ./$PROJECT/modules/datashield-compose.yml"
-fi
   OPAL_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for Opal. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
   if [ ! -e "/etc/bridgehead/trusted-ca-certs/opal-cert.pem" ]; then
     openssl req -x509 -newkey rsa:4096 -nodes -keyout /etc/bridgehead/trusted-ca-certs/opal-key.pem -out /etc/bridgehead/trusted-ca-certs/opal-cert.pem -days 3650 -subj "/CN=${HOST:-opal}/C=DE"
@@ -11,3 +10,4 @@ if [ ! -e "/etc/bridgehead/trusted-ca-certs/opal-cert.pem" ]; then
     chown bridgehead:docker /etc/bridgehead/trusted-ca-certs/opal-key.pem
     chown bridgehead:docker /etc/bridgehead/trusted-ca-certs/opal-cert.pem
   fi
+fi

ccp/modules/exporter-setup.sh

@@ -3,6 +3,6 @@
 if [ -n "$ENABLE_EXPORTER" ]; then
   log INFO "Exporter setup detected -- will start Exporter service."
   OVERRIDE+=" -f ./$PROJECT/modules/exporter-compose.yml"
-fi
   # TODO: Generate password in another way so that not all passwords are the same?
   EXPORTER_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for the exporter. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
+fi

ccp/modules/login-setup.sh

@@ -3,5 +3,5 @@
 if [ "$ENABLE_LOGIN" == true ]; then
   log INFO "Login setup detected -- will start Login services."
   OVERRIDE+=" -f ./$PROJECT/modules/login-compose.yml"
-fi
   KEYCLOAK_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for Keycloak. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
+fi