diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2018-04-26 13:52:44 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2018-04-26 13:52:44 +0200 |
| commit | 90998c24370ea14b2b78d1e2a55bfe33947b2aa7 (patch) | |
| tree | d37c8fe2722b3552508142e9943b27263080d432 | |
| parent | 2b8da263ca53537ed919dbdf95a60891b420dc0a (diff) | |
Apache overrides were not enough (#1873)
It looks like overrides of CustomLog, ErrorLog, Listen did not do the
job fully.
Updated to comment out those lines in httpd.conf.
Fixes the fact that logs were kept in /var/log/apache2/ (instead of
being only given via STDOUT to Docker logs) and the "internal dummy
connection" bug over IPv6 (Docker is typically only IPv4).
| -rw-r--r-- | Docker/Dockerfile | 5 | ||||
| -rw-r--r-- | Docker/FreshRSS.Apache.conf | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 78a0f0e8f..189d7175a 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -15,8 +15,9 @@ WORKDIR ${FRESHRSS_ROOT} COPY . ${FRESHRSS_ROOT} COPY ./Docker/*.Apache.conf /etc/apache2/conf.d/ -RUN echo "17,37 * * * * php ${FRESHRSS_ROOT}/app/actualize_script.php 2>&1 | tee /tmp/FreshRSS.log" >> \ - /var/spool/cron/crontabs/root +RUN sed -r -i "/^[ ]*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/httpd.conf && \ + echo "17,37 * * * * php ${FRESHRSS_ROOT}/app/actualize_script.php 2>&1 | tee /tmp/FreshRSS.log" >> \ + /var/spool/cron/crontabs/root ENV CRON_MIN '' ENTRYPOINT ["./Docker/entrypoint.sh"] diff --git a/Docker/FreshRSS.Apache.conf b/Docker/FreshRSS.Apache.conf index 59151d749..adfc804c6 100644 --- a/Docker/FreshRSS.Apache.conf +++ b/Docker/FreshRSS.Apache.conf @@ -17,8 +17,8 @@ ServerName freshrss.localhost Listen 0.0.0.0:80 DocumentRoot /var/www/FreshRSS/p/ +CustomLog /dev/stdout combined ErrorLog /dev/stderr -TransferLog /dev/stdout AllowEncodedSlashes On <Directory /var/www/FreshRSS/p> |