Merge 8.68 into master

calacademy-research · Dec 31, 2021 · fddcd47 · fddcd47
2 parents bf3faef + 34b0498
commit fddcd47
Show file tree

Hide file tree

Showing 237 changed files with 2,173 additions and 4,507 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,16 @@ See doc/toDo.txt
 
 See doc/install.txt
 
+Configuration
+---
+###Logging levels
+`logs/antwebInfo.log` is configured to show `INFO` and above in production, and `DEBUG` in development. 
+
+The `JAVA_OPTS=-Dlogging.level` system property controls the level. If not provided, the level defaults to `INFO`.
+It is set in `docker-compose.dev.yml` for development environments. 
+
+
+
 Installation
 ---
 [Docker Engine](https://docs.docker.com/engine/install/)
@@ -172,7 +182,8 @@ An external docker volume prevents it from being removed unintentionally. From t
 > Caddy stores TLS certificates, private keys, OCSP staples, and other necessary information to the data directory. It should not be purged without an understanding of the implications.
 
 ```bash
-docker volume create antweb_caddy_data```
+docker volume create antweb_caddy_data
+```
 
 Running
 ---
@@ -194,7 +205,8 @@ production: additional networking configuration
 
 This project uses [Docker BuildKit](https://docs.docker.com/develop/develop-images/build_enhancements/) for some non-backwards compatible features.
 
-Before building the containers, set the following environment variables:
+Before building the containers, set the following environment variables (you can put the lines in `~/.bashrc` 
+to set them automatically):
 
 ```bash
 export DOCKER_BUILDKIT=1

diff --git a/WEB-INF/classes/AntwebResources.properties b/WEB-INF/classes/AntwebResources.properties
diff --git a/WEB-INF/classes/log4j.properties b/WEB-INF/classes/log4j.properties
diff --git a/WEB-INF/struts-configDbAntTest.xml b/WEB-INF/struts-configDbAntTest.xml
diff --git a/bin/appCheck.php b/bin/appCheck.php
diff --git a/bin/batch.sh b/bin/batch.sh