diff --git a/Dockerfile b/Dockerfile index 0d15e42828..48b4860cbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -148,6 +148,8 @@ RUN dos2unix /usr/local/bin/docker-entrypoint && \ sed -i 's/^memory_limit.*$/memory_limit = 512M/' /etc/php/8.1/apache2/php.ini && \ a2enmod rewrite expires headers ssl xsendfile +RUN echo "error_log = /dev/stdout" >> /etc/php/8.1/apache2/php.ini + # Add Apache configuration RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/deploy/apache/avideo.conf b/deploy/apache/avideo.conf index 424679f78e..ca3705fcb2 100644 --- a/deploy/apache/avideo.conf +++ b/deploy/apache/avideo.conf @@ -1,21 +1,8 @@ php_flag log_errors on -php_value error_log /dev/stderr -ErrorLog /dev/stderr -#CustomLog ${APACHE_LOG_DIR}/access.log combined +php_value error_log /dev/stdout +ErrorLog /dev/stdout +CustomLog ${APACHE_LOG_DIR}/access.log combined #TransferLog /dev/stdout - - ServerName localhost - ServerAdmin CONTACT_EMAIL - DocumentRoot "/var/www/html/AVideo" - - - ServerName localhost - ServerAdmin CONTACT_EMAIL - DocumentRoot "/var/www/html/AVideo" - SSLEngine on - SSLCertificateFile TLS_CERTIFICATE_FILE - SSLCertificateKeyFile TLS_CERTIFICATE_KEY - ServerName SERVER_NAME ServerAdmin CONTACT_EMAIL @@ -35,3 +22,16 @@ ErrorLog /dev/stderr Order Allow,Deny Allow from All + + ServerName localhost + ServerAdmin CONTACT_EMAIL + DocumentRoot "/var/www/html/AVideo" + + + ServerName localhost + ServerAdmin CONTACT_EMAIL + DocumentRoot "/var/www/html/AVideo" + SSLEngine on + SSLCertificateFile TLS_CERTIFICATE_FILE + SSLCertificateKeyFile TLS_CERTIFICATE_KEY + \ No newline at end of file diff --git a/deploy/apache/localhost.conf b/deploy/apache/localhost.conf index 1228053e34..5a1b0b3efb 100644 --- a/deploy/apache/localhost.conf +++ b/deploy/apache/localhost.conf @@ -1,23 +1,17 @@ +ErrorLog /dev/stderr +CustomLog ${APACHE_LOG_DIR}/access.log combined +#TransferLog /dev/stdout ServerName SERVER_NAME ServerAlias localhost ServerAdmin CONTACT_EMAIL DocumentRoot "/var/www/html/AVideo" - - ErrorLog /dev/stderr - CustomLog ${APACHE_LOG_DIR}/access.log combined - TransferLog /dev/stdout ServerName SERVER_NAME ServerAlias localhost ServerAdmin CONTACT_EMAIL DocumentRoot "/var/www/html/AVideo" - - ErrorLog /dev/stderr - CustomLog ${APACHE_LOG_DIR}/access.log combined - TransferLog /dev/stdout - SSLEngine on SSLCertificateFile TLS_CERTIFICATE_FILE SSLCertificateKeyFile TLS_CERTIFICATE_KEY diff --git a/objects/include_config.php b/objects/include_config.php index e43f9167b8..2da26d2f85 100644 --- a/objects/include_config.php +++ b/objects/include_config.php @@ -71,7 +71,7 @@ global $global, $config, $advancedCustom, $advancedCustomUser; $global['docker_vars'] = '/var/www/docker_vars.json'; if (file_exists($global['docker_vars'])) { - $global['logfile'] = 'php://stdout'; + $global['logfile'] = 'php://stderr'; } else if (empty($global['logfile'])) { $global['logfile'] = $global['systemRootPath'] . 'videos/avideo.log'; } diff --git a/view/js/script.js b/view/js/script.js index fa2501bc4c..4500b48241 100644 --- a/view/js/script.js +++ b/view/js/script.js @@ -3847,4 +3847,4 @@ function getUser() { function getUniqueValuesFromArray(items) { return [...new Set(items)]; -} \ No newline at end of file +}