diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile index c59aa5a..f5684d7 100644 --- a/2021.09/apache/Dockerfile +++ b/2021.09/apache/Dockerfile @@ -159,6 +159,7 @@ RUN set -ex;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.09" ENV FRIENDICA_ADDONS "2021.09" ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf" diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile index cdb74a3..0b6b66a 100644 --- a/2021.09/fpm-alpine/Dockerfile +++ b/2021.09/fpm-alpine/Dockerfile @@ -131,6 +131,7 @@ RUN set -ex; \ VOLUME /var/www/html +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.09" ENV FRIENDICA_ADDONS "2021.09" ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf" diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile index 658cb4d..1348f34 100644 --- a/2021.09/fpm/Dockerfile +++ b/2021.09/fpm/Dockerfile @@ -150,6 +150,7 @@ RUN set -ex; \ VOLUME /var/www/html +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.09" ENV FRIENDICA_ADDONS "2021.09" ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf" diff --git a/2021.12-dev/apache/Dockerfile b/2021.12-dev/apache/Dockerfile index 9e9c0cf..ff7745c 100644 --- a/2021.12-dev/apache/Dockerfile +++ b/2021.12-dev/apache/Dockerfile @@ -159,6 +159,7 @@ RUN set -ex;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.12-dev" ENV FRIENDICA_ADDONS "2021.12-dev" diff --git a/2021.12-dev/fpm-alpine/Dockerfile b/2021.12-dev/fpm-alpine/Dockerfile index b2ff3e5..d9b0c5e 100644 --- a/2021.12-dev/fpm-alpine/Dockerfile +++ b/2021.12-dev/fpm-alpine/Dockerfile @@ -131,6 +131,7 @@ RUN set -ex; \ VOLUME /var/www/html +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.12-dev" ENV FRIENDICA_ADDONS "2021.12-dev" diff --git a/2021.12-dev/fpm/Dockerfile b/2021.12-dev/fpm/Dockerfile index 0ac1cd3..cff1cd6 100644 --- a/2021.12-dev/fpm/Dockerfile +++ b/2021.12-dev/fpm/Dockerfile @@ -150,6 +150,7 @@ RUN set -ex; \ VOLUME /var/www/html +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.12-dev" ENV FRIENDICA_ADDONS "2021.12-dev" diff --git a/2021.12-rc/apache/Dockerfile b/2021.12-rc/apache/Dockerfile index aa570a3..eddee0f 100644 --- a/2021.12-rc/apache/Dockerfile +++ b/2021.12-rc/apache/Dockerfile @@ -159,6 +159,7 @@ RUN set -ex;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.12-rc" ENV FRIENDICA_ADDONS "2021.12-rc" diff --git a/2021.12-rc/fpm-alpine/Dockerfile b/2021.12-rc/fpm-alpine/Dockerfile index f6690d9..a2f0cbb 100644 --- a/2021.12-rc/fpm-alpine/Dockerfile +++ b/2021.12-rc/fpm-alpine/Dockerfile @@ -131,6 +131,7 @@ RUN set -ex; \ VOLUME /var/www/html +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.12-rc" ENV FRIENDICA_ADDONS "2021.12-rc" diff --git a/2021.12-rc/fpm/Dockerfile b/2021.12-rc/fpm/Dockerfile index 19e8e75..bfcd7a0 100644 --- a/2021.12-rc/fpm/Dockerfile +++ b/2021.12-rc/fpm/Dockerfile @@ -150,6 +150,7 @@ RUN set -ex; \ VOLUME /var/www/html +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "2021.12-rc" ENV FRIENDICA_ADDONS "2021.12-rc" diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 805d04e..380c701 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -130,6 +130,7 @@ RUN set -ex; \ VOLUME /var/www/html %%VARIANT_EXTRAS%% +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "%%VERSION%%" ENV FRIENDICA_ADDONS "%%VERSION%%" %%DOWNLOAD_SHA256%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 97a6455..c5982b7 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -149,6 +149,7 @@ RUN set -ex; \ VOLUME /var/www/html %%VARIANT_EXTRAS%% +ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_VERSION "%%VERSION%%" ENV FRIENDICA_ADDONS "%%VERSION%%" %%DOWNLOAD_SHA256%% diff --git a/README.md b/README.md index 00207a6..a6f75d1 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,9 @@ There are two options to enable background tasks for Friendica: - `FRIENDICA_DEBUGGING` If set to `true`, the logging of Friendica is enabled. - `FRIENDICA_LOGFILE` (optional) The path to the logfile (Default: /var/www/friendica.log). - `FRIENDICA_LOGLEVEL` (optional) The loglevel to log (Default: notice). +- `FRIENDICA_LOGGER` (optional) Set the type - stream, syslog, monolog (Default: stream). +- `FRIENDICA_SYSLOG_FLAGS` (optional) In case syslog is used, set the corresponding flags (Default: `LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR`). +- `FRIENDICA_SYSLOG_FACTORY` (optional) In case syslog is used, set the corresponding factory (Default: `LOG_USER`). **Database** (**required at installation**)