Merge pull request #179 from nupplaphil/feat/syslog

Add syslog capability
This commit is contained in:
Hypolite Petovan 2021-12-13 08:40:07 -05:00 committed by GitHub
commit 69425a7895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 14 additions and 0 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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%%

View File

@ -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%%

View File

@ -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**)