Revert "Remove audit war"

This reverts commit f61a304.
fcrepo-exts · Jul 13, 2017 · fe2f9c1 · fe2f9c1
1 parent 3f88f01
commit fe2f9c1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/install_scripts/fedora4.sh b/install_scripts/fedora4.sh
@@ -10,9 +10,15 @@ if [ -f "$SHARED_DIR/install_scripts/config" ]; then
   . $SHARED_DIR/install_scripts/config
 fi
 
-if [ "${FEDORA_AUTH}" = "true" ]; then
+if [ "${FEDORA_AUTH}" = "true" ] && [ "${FEDORA_AUDIT}" = "true" ]; then
+  WEBAPP="fcrepo-webapp-plus-webac-audit-${FEDORA_VERSION}.war"
+  RELEASES="https://github.com/fcrepo4-exts/fcrepo-webapp-plus/releases/download/fcrepo-webapp-plus-${FEDORA_TAG}"
+elif [ "${FEDORA_AUTH}" = "true" ]; then
   WEBAPP="fcrepo-webapp-plus-webac-${FEDORA_VERSION}.war"
   RELEASES="https://github.com/fcrepo4-exts/fcrepo-webapp-plus/releases/download/fcrepo-webapp-plus-${FEDORA_TAG}"
+elif [ "${FEDORA_AUDIT}" = "true" ]; then
+  WEBAPP="fcrepo-webapp-plus-audit-${FEDORA_VERSION}.war"
+  RELEASES="https://github.com/fcrepo4-exts/fcrepo-webapp-plus/releases/download/fcrepo-webapp-plus-${FEDORA_TAG}"
 else 
   WEBAPP="fcrepo-webapp-plus-${FEDORA_VERSION}.war"
   RELEASES="https://github.com/fcrepo4-exts/fcrepo-webapp-plus/releases/download/fcrepo-webapp-plus-${FEDORA_TAG}"
@@ -33,7 +39,6 @@ fi
 cp "$DOWNLOAD_DIR/$WEBAPP" /var/lib/tomcat7/webapps/fcrepo.war
 chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/fcrepo.war
 
-# This section should be updated with: https://jira.duraspace.org/browse/FCREPO-2531
 AUDIT_LOCATION_ARG="fcrepo.audit.container"
 if [ "${FEDORA_AUDIT}" == "true" ] && ! grep -q "${AUDIT_LOCATION_ARG}" /etc/default/tomcat7 ; then
   echo $'\n' >>  /etc/default/tomcat7;