Revert "Modified to match previous config"

This reverts commit 52441fd.

.env

@@ -3,8 +3,7 @@
 # from the default Demo to one of the following: Local, Test, Staging or Production
 # For more information, consult https://islandora-collaboration-group.github.io/ISLE/install/install-environments/
 
-COMPOSE_PROJECT_NAME=public_local
-BASE_DOMAIN=public.localdomain
+COMPOSE_PROJECT_NAME=isle_demo
+BASE_DOMAIN=isle.localdomain
 CONTAINER_SHORT_ID=ld
-# COMPOSE_FILE=docker-compose.local.yml
-COMPOSE_FILE=docker-compose.local.yml:docker-compose.DG-FEDORA.yml
+COMPOSE_FILE=docker-compose.demo.yml

config/apache/settings_php/settings.local.php

@@ -253,9 +253,9 @@
 
 $databases['default']['default'] = array(
   'driver' => 'mysql',
-  'database' => 'public',
-  'username' => 'public',
-  'password' => 'password',
+  'database' => '',
+  'username' => '',
+  'password' => '',
   'host' => 'mysql',
   'prefix' => '',
   'charset' => 'utf8mb4',
@@ -292,7 +292,7 @@
  *   $drupal_hash_salt = file_get_contents('/home/example/salt.txt');
  *
  * # ISLE Configuration - Replace the value below with the value of DRUPAL_HASH_SALT from the local.env */
-$drupal_hash_salt = 'aRecommendedHashOf45AlphaNumericCharacters45';
+$drupal_hash_salt = '';
 
 /**
  * Base URL (optional).
@@ -636,5 +636,5 @@
 # $conf['theme_debug'] = TRUE;
 
 # Please note your drupal instance is behind a proxy and does have free access
-# to the internet.
-$conf['drupal_http_request_fails'] = FALSE;
+# to the internet. 
+$conf['drupal_http_request_fails'] = FALSE;

local.env

@@ -8,7 +8,7 @@
 ## Database (SQL)
 
 ### MySQL root password
-MYSQL_ROOT_PASSWORD=password
+MYSQL_ROOT_PASSWORD=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ### Fedora database name
 FEDORA_DB=fedora3
@@ -17,16 +17,16 @@ FEDORA_DB=fedora3
 FEDORA_DB_USER=fedora_admin
 
 ### Fedora database password
-FEDORA_DB_PASS=password
+FEDORA_DB_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ### Drupal database name
-DRUPAL_DB=public
+DRUPAL_DB=# Replace this comment with a easy to read but short database name e.g. acmeco_db or institution_db
 
 ### Drupal database user
-DRUPAL_DB_USER=public
+DRUPAL_DB_USER=# Replace this comment with a easy to read but short database user e.g. acmeco_db_user or institution_db_user
 
 ### Drupal database password
-DRUPAL_DB_PASS=password
+DRUPAL_DB_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ## Database (SQL) end.
 
@@ -47,29 +47,29 @@ ISLE_BUILD_TOOLS_BRANCH=7.x-1.13
 ISLANDORA_UID=1000
 
 ### Site name
-DRUPAL_SITE_NAME=public
+DRUPAL_SITE_NAME=# Replace this comment with your Drupal site name here e.g. Institution Digital Library or AcmeCo Digital Collections
 
 ### Site administrator user
-DRUPAL_ADMIN_USER=public
+DRUPAL_ADMIN_USER=# Replace this comment with your Drupal site admin e.g. site_admin
 
 ### Site administrator password
-DRUPAL_ADMIN_PASS=password
+DRUPAL_ADMIN_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ### Site administrator email
-DRUPAL_ADMIN_EMAIL=[email protected]
+DRUPAL_ADMIN_EMAIL=# Replace this comment with your Drupal site admin email address e.g. [email protected]
 
 ### Hash Salt, a long unique alpha-numeric (i.e., no special characters). Suggested length is 45 alpha-numeric characters.
-DRUPAL_HASH_SALT=aRecommendedHashOf45AlphaNumericCharacters45
+DRUPAL_HASH_SALT=# Replace this comment with a recommended hash of 45 alpha-numeric characters
 
 ## End Islandora
 
 
 ## Tomcat Instances (This applies to the Fedora, Solr, and ImageService containers)
 
 TOMCAT_ADMIN_USER=admin
-TOMCAT_ADMIN_PASS=password
+TOMCAT_ADMIN_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 TOMCAT_MANAGER_USER=manager
-TOMCAT_MANAGER_PASS=password
+TOMCAT_MANAGER_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ## End Tomcat
 
@@ -79,19 +79,19 @@ TOMCAT_MANAGER_PASS=password
 FEDORA_ADMIN_USER=fedoraAdmin
 
 ### Fedora administrator password
-FEDORA_ADMIN_PASS=password
+FEDORA_ADMIN_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ### Fedora Generic Search user
 FEDORA_GSEARCH_USER=fgsAdmin
 
 ### Fedora Generic Search fgsAdmin user password
-FEDORA_GSEARCH_PASS=password
+FEDORA_GSEARCH_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ### Fedora internal call user
 FEDORA_INTCALL_USER=fedoraIntCallUser
 
 ### Fedora internal fedoraIntCallUser password
-FEDORA_INTCALL_PASS=password
+FEDORA_INTCALL_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ### Fedora Resource Index
 #
@@ -119,7 +119,7 @@ CANTALOUPE_ADMIN_INTERFACE_ENABLE=true
 
 ### Cantaloupe Admin Username and Password
 CANTALOUPE_ADMIN_USER=admin
-CANTALOUPE_ADMIN_PASS=password
+CANTALOUPE_ADMIN_PASS=# Replace this comment with a recommended password of 26 alpha-numeric characters
 
 ## End Image Services
 
@@ -152,22 +152,22 @@ CANTALOUPE_ADMIN_PASS=password
 ##### Apache Container Logs and Levels
 #
 ### Apache Error log - lowercase only please
-# This log is a combination of the Apache web server error and access log
+# This log is a combination of the Apache web server error and access log 
 # for the domain. Please note it will register only web traffic from the
 # the traefik container.
 #
-# Available output values range from most verbose to least (left to right):
+# Available output values range from most verbose to least (left to right): 
 # trace8, ..., trace1, debug, info, notice, warn, error, crit, alert, emerg
 #
 ### Recommended level is warn
 APACHE_ERROR_LOGLEVEL=warn
 
 ##### FITS Tool Set Log and Levels
-# The File Information Tool Set (FITS) identifies, validates and extracts technical
+# The File Information Tool Set (FITS) identifies, validates and extracts technical 
 # metadata for a wide range of file formats.
 # Use the following logs below to debug ingests of PDF, Video, audio and more.
-#
-# Available output values range from most verbose to least (left to right):
+# 
+# Available output values range from most verbose to least (left to right): 
 # ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF (Turns off logging)
 #
 ### Recommended levels are ERROR or FATAL
@@ -187,7 +187,7 @@ FITS_ORG_APACHE_PDFBOX_LOG_LEVEL=ERROR
 #
 # These logs contain information and output concerning the Fedora Commons Repository
 #
-# Available output values range from most verbose to least (left to right):
+# Available output values range from most verbose to least (left to right): 
 # ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF (Turns off logging)
 #
 ### Recommended levels are WARN
@@ -208,20 +208,20 @@ FEDORA_ORG_FCREPO_SERVER_SECURITY_XACML_LOG=WARN
 
 ## Fedora Gsearch logs
 #
-# These logs contain information and output concerning the interaction of Fedora, Gsearch and
+# These logs contain information and output concerning the interaction of Fedora, Gsearch and 
 # Solr Search. Given that most output is the result of successful Gsearch transforms & Solr search queries
 # It is highly recommended that these logs be set to WARN due to the large amount of output.
 #
-# Available output values range from most verbose to least (left to right):
+# Available output values range from most verbose to least (left to right): 
 # ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF (Turns off logging)
 #
 ### Recommended levels are WARN
-#
+# 
 # Use these two logs below for general purpose debugging of Fedoragsearch
 GSEARCH_DK_DEFXWS_FEDORAGSEARCH_LOG=WARN
 GSEARCH_ROOT_LOG=WARN
 
-# All other Gsearch loggers default level.
+# All other Gsearch loggers default level. 
 # Change levels below only for a larger scope of debugging. (best to keep at these defaults)
 ### Recommended levels are WARN
 GSEARCH_DK_DEFXWS_FGSZEBRA_LOG=WARN
@@ -233,7 +233,7 @@ GSEARCH_DK_DEFXWS_FGSSOLR_LOG=WARN
 # Cantaloupe loggers appear to prefer loglevels to be lowercase.
 # otherwise values fail.
 #
-# Available output values range from most verbose to least (left to right):
+# Available output values range from most verbose to least (left to right): 
 # `trace`, `debug`, `info`, `warn`, `error`, `all`, or `off`
 #
 ### Recommended level is error
@@ -245,7 +245,7 @@ CANTALOUPE_LOG_APPLICATION_LEVEL=error
 # It is highly recommended that these logs be set to OFF or WARN due to the
 # large amount of output.
 #
-# Available output values range from most verbose to least (left to right):
+# Available output values range from most verbose to least (left to right): 
 # ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF (Turns off logging)
 #
 ### Recommended levels are WARN or OFF
@@ -261,7 +261,7 @@ SOLR_ORG_APACHE_SOLR_UPDATE_LOGGINGINFORSTREAM=OFF
 # Tomcat Logger Level
 # https://tomcat.apache.org/tomcat-8.5-doc/logging.html
 # A handler's log level threshold is INFO by default and can be set by using:
-# SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST or ALL.
+# SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST or ALL. 
 #
 # The output range above is: (left to right)
 # Lowest level (least amount of output) = SEVERE
@@ -270,13 +270,13 @@ SOLR_ORG_APACHE_SOLR_UPDATE_LOGGINGINFORSTREAM=OFF
 # Change levels to FINEST or ALL for debugging purposes only
 #
 # Please note the log level changes of FINEST or all can drastically increase the following:
-# disk activity, memory usage, Java memory usage and network activity.
+# disk activity, memory usage, Java memory usage and network activity. 
 #
 # Use these logs for general purpose debugging
 TOMCAT_JAVA_UTIL_LOGGING_CONSOLE_HANDLER=WARNING
 TOMCAT_LOCALHOST_LOG=WARNING
 
-# These logs typically document Tomcat logins.
+# These logs typically document Tomcat logins. 
 # Used for security and tomcat account auditing.
 TOMCAT_LOCALHOST_MANAGER_LOG=WARNING
 TOMCAT_LOCALHOST_HOST_MANAGER_LOG=WARNING