Add conditional check for ActiveMQ configuration

Author: joecorall

images/fcrepo6/rootfs/etc/confd/templates/activemq.xml.tmpl

@@ -9,7 +9,6 @@
 
     <context:property-placeholder/>
 
-{{ if or (ne (getenv "FCREPO_ACTIVEMQ_QUEUE") "") (ne (getenv "FCREPO_ACTIVEMQ_TOPIC") "") }}
     <!--
         The <broker> element is used to configure the ActiveMQ broker.
     -->
@@ -30,5 +29,4 @@
         </networkConnector>
       </networkConnectors>
     </broker>
-{{ end }}
 </beans>

images/fcrepo6/rootfs/etc/s6-overlay/scripts/fcrepo-setup.sh

@@ -78,9 +78,7 @@ function main {
     # actually can write to the folder.
     chown tomcat:tomcat /data
     if [ -n "${FCREPO_ACTIVEMQ_QUEUE:-}" ] || [ -n "${FCREPO_ACTIVEMQ_TOPIC:-}" ]; then
-        # Fcrepo can fail to start if it cannot connect to an broker on startup.
-        # ideally this is just enforced with a docker compose service conditon on activemq
-        wait_for_broker
+      wait_for_broker
     fi
 }
 main

images/fcrepo6/rootfs/opt/tomcat/bin/setenv.sh

@@ -1,26 +1,31 @@
 #!/command/with-contenv bash
 # shellcheck shell=bash
 export JAVA_OPTS="${TOMCAT_JAVA_OPTS}"
-export CATALINA_OPTS="${TOMCAT_CATALINA_OPTS}"
-export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.home=/data/home"
-export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.velocity.runtime.log=/dev/stdout"
-export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.jms.baseUrl=http://${HOSTNAME}/fcrepo/rest"
-export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.external.content.allowed=/opt/tomcat/conf/allowed-external-content.txt"
-export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.autoversioning.enabled=false"
-export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.activemq.directory=file:///data/home/data/Activemq"
-export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.activemq.configuration=file:///opt/tomcat/conf/activemq.xml"
-# Set timeout
-export CATALINA_OPTS="${CATALINA_OPTS} -DconnectionTimeout=${FCREPO_CATALINA_TIMEOUT:=-1}"
+CATALINA_OPTS="${TOMCAT_CATALINA_OPTS}"
+CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.home=/data/home"
+CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.velocity.runtime.log=/dev/stdout"
+CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.external.content.allowed=/opt/tomcat/conf/allowed-external-content.txt"
+CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.autoversioning.enabled=false"
+
+if [ -z "${FCREPO_ACTIVEMQ_QUEUE:-}" ] && [ -z "${FCREPO_ACTIVEMQ_TOPIC:-}" ]; then
+  CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.jms.enabled=false"
+else
+  CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.jms.baseUrl=http://${HOSTNAME}/fcrepo/rest"
+  CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.activemq.directory=file:///data/home/data/Activemq"
+  CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.activemq.configuration=file:///opt/tomcat/conf/activemq.xml"
+fi
+
+CATALINA_OPTS="${CATALINA_OPTS} -DconnectionTimeout=${FCREPO_CATALINA_TIMEOUT:=-1}"
 
 case "${DB_DRIVER}" in
 none)
     # No action required.
     ;;
 mysql)
-    export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.db.url=jdbc:mysql://${DB_MYSQL_HOST}:${DB_MYSQL_PORT}/${FCREPO_DB_NAME}"
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.db.url=jdbc:mysql://${DB_MYSQL_HOST}:${DB_MYSQL_PORT}/${FCREPO_DB_NAME}"
     ;;
 postgresql)
-    export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.db.url=jdbc:postgresql://${DB_POSTGRESQL_HOST}:${DB_POSTGRESQL_PORT}/${FCREPO_DB_NAME}"
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.db.url=jdbc:postgresql://${DB_POSTGRESQL_HOST}:${DB_POSTGRESQL_PORT}/${FCREPO_DB_NAME}"
     ;;
 *)
     echo "Only mysql/postgresql are supported values for DB_DRIVER." >&2
@@ -29,18 +34,21 @@ postgresql)
 esac
 
 if [[ "${DB_DRIVER}" != "none" ]]; then
-    export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.db.user=${FCREPO_DB_USER}"
-    export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.db.password=${FCREPO_DB_PASSWORD}"
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.db.user=${FCREPO_DB_USER}"
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.db.password=${FCREPO_DB_PASSWORD}"
 fi
 
 if [[ "${FCREPO_DISABLE_SYN}" == "true" ]]; then
-    export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.properties.management=relaxed"
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.properties.management=relaxed"
 fi
 
 if [[ "${FCREPO_BINARYSTORAGE_TYPE}" == "file" ]]; then
-    export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.storage=ocfl-fs"
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.storage=ocfl-fs"
 fi
 if [[ "${FCREPO_BINARYSTORAGE_TYPE}" == "s3" ]]; then
     # Enable S3 mode and set default options
-    export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.storage=ocfl-s3 -Dfcrepo.aws.region=${FCREPO_AWS_REGION} -Dfcrepo.ocfl.s3.bucket=${FCREPO_S3_BUCKET} -Dfcrepo.ocfl.s3.prefix=${FCREPO_S3_PREFIX}"
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.storage=ocfl-s3 -Dfcrepo.aws.region=${FCREPO_AWS_REGION} -Dfcrepo.ocfl.s3.bucket=${FCREPO_S3_BUCKET} -Dfcrepo.ocfl.s3.prefix=${FCREPO_S3_PREFIX}"
 fi
+
+
+export CATALINA_OPTS