eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #1339 from nextcloud/enh/noid/improve-logging

Browse source 
improve logging situation
This commit is contained in:
Simon L 2022-10-31 15:14:00 +01:00 • committed by GitHub
commit bdfb238683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containers/apache/nextcloud.conf
View file

@ -1,5 +1,7 @@
Listen 8000 Listen 8000
<VirtualHost *:8000> <VirtualHost *:8000>
ServerName localhost
# Add error log # Add error log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access.log combined
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log

2
Containers/mastercontainer/Dockerfile
View file

@ -52,7 +52,7 @@ RUN set -e && \
cd ..; \ cd ..; \
rm -f /usr/local/bin/composer; \ rm -f /usr/local/bin/composer; \
chmod 770 -R ./; \ chmod 770 -R ./; \
chown www-data:www-data -R ./; \ chown www-data:www-data -R /var/www; \
rm -r ./php/data; \ rm -r ./php/data; \
rm -r ./php/session rm -r ./php/session

2
Containers/mastercontainer/mastercontainer.conf
View file

@ -11,6 +11,8 @@ ErrorLog ${APACHE_LOG_DIR}/error.log
# Http host # Http host
<VirtualHost *:8000> <VirtualHost *:8000>
ServerName localhost
# PHP match # PHP match
<FilesMatch "\.php$"> <FilesMatch "\.php$">
SetHandler application/x-httpd-php SetHandler application/x-httpd-php

12
Containers/mastercontainer/supervisord.conf
View file

@ -1,26 +1,28 @@
[supervisord] [supervisord]
nodaemon=true nodaemon=true
nodaemon=true
logfile=/var/log/supervisord/supervisord.log logfile=/var/log/supervisord/supervisord.log
pidfile=/var/run/supervisord/supervisord.pid pidfile=/var/run/supervisord/supervisord.pid
childlogdir=/var/log/supervisord/ childlogdir=/var/log/supervisord/
logfile_maxbytes=50MB logfile_maxbytes=50MB
logfile_backups=10 logfile_backups=10
loglevel=error loglevel=error
user=root
[program:apache] [program:apache]
stdout_logfile=/dev/stdout # stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 # stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
command=apache2-foreground command=apache2-foreground
user=root
[program:caddy] [program:caddy]
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
command=sudo -u www-data /usr/bin/caddy run --config /Caddyfile command=/usr/bin/caddy run --config /Caddyfile
user=www-data
[program:cron] [program:cron]
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@ -35,6 +37,7 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
command=/backup-time-file-watcher.sh command=/backup-time-file-watcher.sh
user=root
[program:session-deduplicator] [program:session-deduplicator]
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@ -42,3 +45,4 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
command=/session-deduplicator.sh command=/session-deduplicator.sh
user=root

6
Containers/nextcloud/supervisord.conf
View file

@ -7,13 +7,15 @@ childlogdir=/var/log/supervisord/
logfile_maxbytes=50MB ; maximum size of logfile before rotation logfile_maxbytes=50MB ; maximum size of logfile before rotation
logfile_backups=10 ; number of backed up logfiles logfile_backups=10 ; number of backed up logfiles
loglevel=error loglevel=error
user=root
[program:php-fpm] [program:php-fpm]
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr # stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 # stderr_logfile_maxbytes=0
command=php-fpm command=php-fpm
user=root
[program:cron] [program:cron]
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout