A free, self-hostable news aggregator…
Add Docker access log toggle (#9191)
Morax4023406feeda
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfileindex 6e8ebf9b3..1d42e95a1 100644--- a/.devcontainer/Dockerfile+++ b/.devcontainer/Dockerfile@@ -30,6 +30,7 @@ ENV COPY_LOG_TO_SYSLOG=OnENV COPY_SYSLOG_TO_STDERR=OnENV CRON_MIN=''ENV DATA_PATH=''+ENV ENABLE_ACCESS_LOG=1ENV FRESHRSS_ENV='development'ENV LISTEN='0.0.0.0:8080'ENV TRUSTED_PROXY=0diff --git a/Docker/Dockerfile b/Docker/Dockerfileindex 9e9ae54a0..332a6a02d 100644--- a/Docker/Dockerfile+++ b/Docker/Dockerfile@@ -59,6 +59,7 @@ ENV COPY_LOG_TO_SYSLOG=OnENV COPY_SYSLOG_TO_STDERR=OnENV CRON_MIN=''ENV DATA_PATH=''+ENV ENABLE_ACCESS_LOG=1ENV FRESHRSS_ENV=''ENV LISTEN=''ENV OIDC_ENABLED=''diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpineindex ad93950d0..acbd37412 100644--- a/Docker/Dockerfile-Alpine+++ b/Docker/Dockerfile-Alpine@@ -55,6 +55,7 @@ ENV COPY_LOG_TO_SYSLOG=OnENV COPY_SYSLOG_TO_STDERR=OnENV CRON_MIN=''ENV DATA_PATH=''+ENV ENABLE_ACCESS_LOG=1ENV FRESHRSS_ENV=''ENV LISTEN=''ENV OIDC_ENABLED=''diff --git a/Docker/Dockerfile-Arch b/Docker/Dockerfile-Archindex 44860826f..552d10f8d 100644--- a/Docker/Dockerfile-Arch+++ b/Docker/Dockerfile-Arch@@ -56,6 +56,7 @@ ENV COPY_LOG_TO_SYSLOG=OnENV COPY_SYSLOG_TO_STDERR=OnENV CRON_MIN=''ENV DATA_PATH=''+ENV ENABLE_ACCESS_LOG=1ENV FRESHRSS_ENV=''ENV LISTEN=''ENV OIDC_ENABLED=''diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newestindex 3d3ed9b76..8698b86c8 100644--- a/Docker/Dockerfile-Newest+++ b/Docker/Dockerfile-Newest@@ -59,6 +59,7 @@ ENV COPY_LOG_TO_SYSLOG=OnENV COPY_SYSLOG_TO_STDERR=OnENV CRON_MIN=''ENV DATA_PATH=''+ENV ENABLE_ACCESS_LOG=1ENV FRESHRSS_ENV=''ENV LISTEN=''ENV OIDC_ENABLED=''diff --git a/Docker/Dockerfile-Oldest b/Docker/Dockerfile-Oldestindex c76f896dd..55c3b011f 100644--- a/Docker/Dockerfile-Oldest+++ b/Docker/Dockerfile-Oldest@@ -57,6 +57,7 @@ ENV COPY_LOG_TO_SYSLOG=OnENV COPY_SYSLOG_TO_STDERR=OnENV CRON_MIN=''ENV DATA_PATH=''+ENV ENABLE_ACCESS_LOG=1ENV FRESHRSS_ENV=''ENV LISTEN=''ENV OIDC_ENABLED=''diff --git a/Docker/README.md b/Docker/README.mdindex 6d1860bcf..8b5bb74d1 100644--- a/Docker/README.md+++ b/Docker/README.md@@ -94,6 +94,7 @@ and with newer packages in general (Apache, PHP).* `TZ`: (default is `UTC`) A [server timezone](http://php.net/timezones)* `CRON_MIN`: (default is disabled) Define minutes for the built-in cron job to automatically refresh feeds (see below for more advanced options)* `DATA_PATH`: (default is empty, defined by `./constants.local.php` or `./constants.php`) Defines the path for writeable data.+* `ENABLE_ACCESS_LOG`: (default is `1`) Set to `0` to disable the Apache access log.* `FRESHRSS_ENV`: (default is `production`) Enables additional development information if set to `development` (increases the level of logging and ensures that errors are displayed) (see below for more development options)* `COPY_LOG_TO_SYSLOG`: (default is `On`) Copy all the logs to syslog* `COPY_SYSLOG_TO_STDERR`: (default is `On`) Copy syslog to Standard Error so that it is visible in docker logsdiff --git a/Docker/entrypoint.sh b/Docker/entrypoint.shindex a79853d66..93a72f12a 100755--- a/Docker/entrypoint.sh+++ b/Docker/entrypoint.sh@@ -24,6 +24,10 @@ if [ -z "$APACHE_CONFIG" ]; thenexit 11fi+if [ "$ENABLE_ACCESS_LOG" = "0" ]; then+ sed -E -i '/^[ \t]*CustomLog[ \t]/s/^/#/' "$APACHE_CONFIG"+fi+if [ -n "$LISTEN" ]; thensed -r -i "\\#^Listen#s#^.*#Listen $LISTEN#" "$APACHE_CONFIG"fi