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).
pull/1874/head
Alexandre Alapetite 7 years ago committed by GitHub
parent 2b8da263ca
commit 90998c2437
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      Docker/Dockerfile
  2. 2
      Docker/FreshRSS.Apache.conf

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

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

Loading…
Cancel
Save