diff --git a/.env b/.env index 1f8dfc592..b357b8ab5 100755 --- a/.env +++ b/.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 diff --git a/config/apache/settings_php/settings.local.php b/config/apache/settings_php/settings.local.php index 74fa67d5b..caa95829c 100644 --- a/config/apache/settings_php/settings.local.php +++ b/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; \ No newline at end of file diff --git a/config/proxy/ssl-certs/dg.localdomain.key b/config/proxy/ssl-certs/dg.localdomain.key deleted file mode 100644 index 99807939b..000000000 --- a/config/proxy/ssl-certs/dg.localdomain.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCo3NuC1XIn3dQ2 -XuSR1sRwKbj2eZ3y4O8lW2WUXH3Xnan/I+1gLHQbfHk7IWjh1VAvn3iSqf5kVvBf -OchFms69qL8rLokfhYq4MAG5OYc7y0wyLhMRZUDRRIX2fvrxUQhQa6MGIFdCSt05 -FkFmQ+jqLWsysB8Or62kuULaYF9HG9NwszqGsXHbKEwSCKhPJGp+6/cY2J+6kuKa -6hGVa0ItoY08QO5HmGNh78r/7Wio0LPxXIKO7sIvDFO2Bg9lpQJwKutb6VVaJLOB -1JzhaTzXqfBaxIr4+Fj7zTtou6J7ui1Pg1Pyfpcbiqrz0QpjIr4c0sY0ILqk4tW1 -81h3ScG3AgMBAAECggEAZ8+vW5WhIoUri2l3F3lzNolP3qcRxVknbE3t+vGJo96X -vfT2X+O0VZmGZiW59uxO6ZgeZfwAGuufxssdJj1v0AVH0WJAhpJwn59Tz+1gCBCJ -fWf57P3UhVKdENcrquNoOxiRFpkXS/f+XLQj7JzfOehGONkxnrO+CsCiKuKIcIvY -zpbdbnovwD5qpqPKUlUcL34xFIV0Db9l+Ivth2YWPjTRbnfnvA0d0HZprUooneqm -GhqFrwWt8gDR+kCjYbgYEPzW9zPEEG9pvnMAGM2cWhEDdOchvjjuEYz79jnln7F0 -CJFNgJYoYeh6GfcTrCjcVnmTfEe1t/zPFYN+wvJSIQKBgQDat8tOmfjoP7nL5dB+ -VkfpjOPg5c35+R9Wa3E+PBgI1ICNH1m6tJuiyvPPREHIMG3EJ1uKAibX7r2ZeT6n -754BjMlrlrJrKRfbrQaFg4gHr1Xu81VahWaLv5S3lswphatdQFK86knq8sMpz58e -FEb1yMW5EJ9Onq2C9Z1+TSEmbwKBgQDFpYdNtAVRJ/RFTZzkox/97GmNa4mR7HvS -fFeu1++fPOxkZS1POg1gAz2+48PI+4LLkR6Rob2AS4YSBDzaQvux4GOFG38MoO79 -vV30Hch4hiRD2qCeZ23jLb1kOHnjNtkzMXrXcu2342OOmKE1S09Euthw5XiKB4oN -cMfKCRx9OQKBgQDV9zG0Tlq7UgRAHS3vOhcVupf/nrD3V6g5kdhx6rYUhVbROBc+ -2IrdIjCL1pmH7yCi4WHizCIV4l+nMX6DKZ3opEMztnQK82N8q3MS0E8WPYgSwAgD -Czf7hMtHIwXNpQ+0pUWLvKPdbepRD+T4txuIPQZ4+nLupbrWv9N4CJpijwKBgEA1 -nXZN9Kg/7aiSJVVV9W+93TC3bfL9O+DOyoGf31YBKd8Xy5eAiZXWl7mrLxDdPMm7 -dI3lWLYUUxMJU2eo+TH5bvtwSl8k7V97pMlI37bgBWoR3bp4aYezdWLYwihhykBK -Y9kYmkfyVIaf6UdyFueCOAy9T+KvvlbNe+qT+TBpAoGAPLZQBABmXdhxBBi//NMF -aYVQuqQVf5AlySiqZdCfESwUGQMCtmVAD0T10+AZHE/BemWeC9tCTrXhINqk0JQp -b7V0DLVpuO9T6Rpn1SXRlSNrPFtwtHu+J32SnYisjp/VFROzgpxSb3WbL0iXZuZB -ejAICg/5S82hRN5xnly+FQ8= ------END PRIVATE KEY----- diff --git a/config/proxy/ssl-certs/dg.localdomain.pem b/config/proxy/ssl-certs/dg.localdomain.pem deleted file mode 100644 index 3f2f8adc7..000000000 --- a/config/proxy/ssl-certs/dg.localdomain.pem +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDWDCCAkACCQD+K+C+gk3/JTANBgkqhkiG9w0BAQsFADBuMQswCQYDVQQGEwJV -UzEjMCEGA1UECgwaR3Jpbm5lbGwgQ29sbGVnZSBMaWJyYXJpZXMxITAfBgNVBAsM -GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAwwOZGcubG9jYWxkb21h -aW4wHhcNMTkwOTI0MTkyNjM2WhcNMjkwOTIxMTkyNjM2WjBuMQswCQYDVQQGEwJV -UzEjMCEGA1UECgwaR3Jpbm5lbGwgQ29sbGVnZSBMaWJyYXJpZXMxITAfBgNVBAsM -GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAwwOZGcubG9jYWxkb21h -aW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo3NuC1XIn3dQ2XuSR -1sRwKbj2eZ3y4O8lW2WUXH3Xnan/I+1gLHQbfHk7IWjh1VAvn3iSqf5kVvBfOchF -ms69qL8rLokfhYq4MAG5OYc7y0wyLhMRZUDRRIX2fvrxUQhQa6MGIFdCSt05FkFm -Q+jqLWsysB8Or62kuULaYF9HG9NwszqGsXHbKEwSCKhPJGp+6/cY2J+6kuKa6hGV -a0ItoY08QO5HmGNh78r/7Wio0LPxXIKO7sIvDFO2Bg9lpQJwKutb6VVaJLOB1Jzh -aTzXqfBaxIr4+Fj7zTtou6J7ui1Pg1Pyfpcbiqrz0QpjIr4c0sY0ILqk4tW181h3 -ScG3AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF9E/ZN5R5g5XJicRDXg6XszEayq -pHZtsOo9FCG1IqA+hz4iZABpFZZ6R6yDvHrUFbVhJ3mMIazUc1Py4+Q5SCihKM21 -ZdMG6PW/vQaIf9YTP/Msd1InQs+jweM8a088IXODYIPwaHsgneLkyX5dw/wLNTDU -QEcDrkMI68DoFZ54zOsD09ihbfREgD5VzUua2s99rWXR5vsw9EfF9ByU6HKIiJGC -XUU7x/aFcdwhf3L2m/43QFhW9VWOqXO95oppYuNnNwnb1bCAgVCRkO6R7IRxdKZA -IzUFhfjIbCIBeYEFybZmO0YNL4H/14dPtWjDIOBGEZodEEGKQuRChKvc3+I= ------END CERTIFICATE----- diff --git a/config/proxy/ssl-certs/public.localdomain.key b/config/proxy/ssl-certs/public.localdomain.key deleted file mode 100644 index c3864f668..000000000 --- a/config/proxy/ssl-certs/public.localdomain.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvN3XeLW5eNhVd -RDMU5PCPvKBrSGa+i7yC2rZL+Fv7UR1t97obZOzKUY65QxF72TFtqODM29JsBxBh -SgeASOeNf+jPJO3ybVkuGQ/qxgDXxNBcb3ekvTaWfOqKbFLxLQUDbUWdX53hJ8sE -TBMQW6mm88TOCVrI7cZ84pOuNS2a5LICE0166WPvieK/OggM6uBXIw+rqOoX4ZV6 -OKD1tw1fJ1Cx7MBqNonMZnpTadUOtm46A8Vq+VR+XTTC2rRFjBSYmniyZyPg72bs -Xjmq/jP3XY6HlnQoUdLN1aY6Q3U1byFlc0sbAntVx1ym+cqb/NCBMzfS/zzCrM4n -jIFb1qn1AgMBAAECggEBAKHUhYbJSzC0nxLfVJatxQnc3AV6f3rqMRhizRBpuPrr -tlTFAx0eIB3VKg8uRM2wkpiH6+kJ9tVTyOsypq7zpvnn86yunR7VpBKRj0P10P14 -iEF3qnd7Uxm3EiD7X7flLsY1fKCXmYhFaprzcIAhSRYr+8+YkEMYacUat++kqhRu -Me8oScjoQb49PdxR4A9zrw6USby8LueC2q/JlLlv70rbyQpIEKy+xsh0XqARiFT6 -EBbE06etCQbNhBa3DvjCE2jKFY4FelX4wvsnpQc+iZh5dztrcZaAtClQH9vYB378 -PwqDMDmJj2Hh5/Wf1bI58noKDv1cygO2pCacKOyxHMECgYEA3PPRYVTQKGvWlxuN -vQecwggtXpf1xPHEIY6okETL3d8sRLjj3AwMGfYL1vjMGAQ4oFlfgM+Iy6DIWzhP -NllBSZgG9D22wC41imBEteH1ieGTju4ERAEl5oI5M3V49K1C9QgrPwTXStOLapoH -wWUHI5pHHt6gh770OszObPQIC0kCgYEAywJ08NrvZLbamivF9HMbhnd6sZJZ2Vo/ -G9rUmmsdi4jmYf8jHkFS/3fF/YMzLv5Isk6vNASI86GBjUkp1H1AYTTpbhuSuTvn -OJX33ZqDZ2BOEo9zoZ365OKynQcxDp+48QP5clb4mDjgJz2GLt0dH5er1UEXLNqk -p/iliOcEHU0CgYA3I7WV55eG7tp/nUWy7cpl9ap019Fik78RbMuOLUz/Eqm2gLmE -eZEvjWKJBE/SkoMbKRKXT7NgtcAqW5QRCRcs6X6axyfrL9z2qm2bQkeHYD71xVpV -KkAuFUN3HxLPZMm34pEAShH8P2ykbsoOrkqozOCAyKghGDtUzTWapQ+42QKBgBl/ -In7JkH1+ta/dRYxxFIjr4p4AuoYg3oI6Fq+aOmi29fBi4d8/5xOs0FIJs1j4mNrE -JR8MXsLyitna0YUdggNzaMnqbqATFPQ3aZ0Mdep63vNXzvcCZ2ttyW8NYyzqBIlI -rYCdybUcl5J2GK80GB9KpksvVKDOiRWLlga+tPaVAoGAIX+16odoZ77+4UyMvoBL -f57Tv7/W0y53kska4NvG7GMk7duEWX3QPC6PR0RnJIO7bucsmhxn2ICVurrKMxdq -atXceVlvCzYB2ecAKh737xF/TIAFrRVqdil5DH12yEMTUr46sObnjVFUDjGffZsK -0mb7dKmoCH+3EED13zi/WlA= ------END PRIVATE KEY----- diff --git a/config/proxy/ssl-certs/public.localdomain.pem b/config/proxy/ssl-certs/public.localdomain.pem deleted file mode 100644 index 5395c595b..000000000 --- a/config/proxy/ssl-certs/public.localdomain.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDYDCCAkgCCQDWyeE2rad+QjANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJV -UzEjMCEGA1UECgwaR3Jpbm5lbGwgQ29sbGVnZSBMaWJyYXJpZXMxITAfBgNVBAsM -GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAwwScHVibGljLmxvY2Fs -ZG9tYWluMB4XDTE5MDkyNjE4MDU1OVoXDTI5MDkyMzE4MDU1OVowcjELMAkGA1UE -BhMCVVMxIzAhBgNVBAoMGkdyaW5uZWxsIENvbGxlZ2UgTGlicmFyaWVzMSEwHwYD -VQQLDBhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAMMEnB1YmxpYy5s -b2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK83dd4t -bl42FV1EMxTk8I+8oGtIZr6LvILatkv4W/tRHW33uhtk7MpRjrlDEXvZMW2o4Mzb -0mwHEGFKB4BI541/6M8k7fJtWS4ZD+rGANfE0Fxvd6S9NpZ86opsUvEtBQNtRZ1f -neEnywRMExBbqabzxM4JWsjtxnzik641LZrksgITTXrpY++J4r86CAzq4FcjD6uo -6hfhlXo4oPW3DV8nULHswGo2icxmelNp1Q62bjoDxWr5VH5dNMLatEWMFJiaeLJn -I+DvZuxeOar+M/ddjoeWdChR0s3VpjpDdTVvIWVzSxsCe1XHXKb5ypv80IEzN9L/ -PMKszieMgVvWqfUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAbWND1XCsXgKj6LEw -m82LQvWffPKLAxil0qbvIJfYK7ATWJ6IXLD9Lnrn++tmoKRLZqYdP9oTRT2aeyTY -i1Nv039p/UWeoRB6hqinCWpRylt8jPNAEzlswyYs3iJUro2UU2eIcOVZpstXgSKE -uoVW27XLy3kHfzofoM6wSEiTs/yviNMH5XB3fLEjQ8+IGFQPaq+ViVivwvCP/mZ7 -D7RPMBZAOYwfvP9qeOYY/OOuDZ5yBbCGGo+UP5RnHLUKtGc9GLqQo0S5viHJPNk7 -SjQBPBQoBlEDcuWAYNrQFiTyVUFVb1PK2dPhJsv3s4/phQoE0iNMxVERxS2YJC7G -S5Ic9g== ------END CERTIFICATE----- diff --git a/docker-compose.DG-FEDORA.yml b/docker-compose.DG-FEDORA.yml deleted file mode 100755 index 3b69fb3ca..000000000 --- a/docker-compose.DG-FEDORA.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: '3.7' - -#### docker-compose up -d; -## Local Environment - Used for Drupal site development, more extensive metadata, Solr and Fedora development work on a local laptop or workstation -## Updated 2019-09 - Release 1.3.0-dev (@ 1.3.0-dev) - -services: - - fedora: - volumes: - - /Volumes/DG-FEDORA/datastreamStore:/usr/local/fedora/data/datastreamStore - - /Volumes/DG-FEDORA/objectStore:/usr/local/fedora/data/objectStore diff --git a/local.env b/local.env index ffbe2c7f3..0339cdc9d 100755 --- a/local.env +++ b/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,19 +47,19 @@ 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=bogus@public.com +DRUPAL_ADMIN_EMAIL=# Replace this comment with your Drupal site admin email address e.g. admin@yourinstitution-here.edu ### 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 @@ -67,9 +67,9 @@ DRUPAL_HASH_SALT=aRecommendedHashOf45AlphaNumericCharacters45 ## 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 diff --git a/traefik.local.toml b/traefik.local.toml deleted file mode 100755 index b90100150..000000000 --- a/traefik.local.toml +++ /dev/null @@ -1,134 +0,0 @@ -################################################################ -# Global configuration -################################################################ - -# Enable debug mode -# debug = true - -# Log level -logLevel = "ERROR" - -################################################################ -# Entrypoints configuration -################################################################ - -# Entrypoints definition -defaultEntryPoints = ["http", "https"] - -[entryPoints] - [entryPoints.http] - address = ":80" - [entryPoints.http.redirect] - entryPoint = "https" - [entryPoints.https] - address = ":443" - [entryPoints.https.tls] - [[entryPoints.https.tls.certificates]] - certFile = "/certs/public.localdomain.pem" - keyFile = "/certs/public.localdomain.key" - -# Lines above are for use of self-signed SSL certificates only. -# Let's Encrypt cannot be used with locals or demos. -# Use the script called /config/proxy/ssl-certs/local.sh to generate these Local self-signed SSL certificates. -# Once created add their names to the certFile and keyFile sections accordingly - - -################################################################ -# Traefik logs configuration -################################################################ - -# Traefik logs -# Enabled by default and log to stdout -# -# Optional -# -[traefikLog] - -# Sets the filepath for the traefik log. If not specified, stdout will be used. -# Intermediate directories are created if necessary. -# -# Optional -# Default: os.Stdout -# -#filePath = "/etc/traefik/traefik_logs/traefik.log" - -# Format is either "json" or "common". -# -# Optional -# Default: "common" -# -format = "common" - -################################################################ -# Access logs configuration -################################################################ - -# Enable access logs -# By default it will write to stdout and produce logs in the textual -# Common Log Format (CLF), extended with additional fields. -# -# Optional -# -[accessLog] - -# Sets the file path for the access log. If not specified, stdout will be used. -# Intermediate directories are created if necessary. -# -# Optional -# Default: os.Stdout -# -#filePath = "/etc/traefik/traefik_logs/access.log" - -# Format is either "json" or "common". -# -# Optional -# Default: "common" -# -format = "common" - -################################################################ -# API and dashboard configuration -################################################################ - -# Enable API and dashboard -[api] - - # Name of the related entry point - # - # Optional - # Default: "traefik" - # - # entryPoint = "traefik" - - # Enabled Dashboard - # - # Optional - # Default: true - # - # dashboard = false - -################################################################ -# Docker configuration backend -################################################################ - -# Enable Docker configuration backend -[docker] - -# Docker server endpoint. Can be a tcp or a unix socket endpoint. -# -# Required -# Default: "unix:///var/run/docker.sock" -# -# endpoint = "tcp://10.10.10.10:2375" -endpoint = "unix:///var/run/docker.sock" -exposedbydefault = false -watch = true - -## usebindportip = true ## deprecated per Traefik developers. - -# Use Swarm Mode services as data provider. -# -# Optional -# Default: false -# -# swarmmode = false