Merge b154a4fbdf into af3742f852

.config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2024.12/apache/Dockerfile

@@ -169,6 +169,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2024.12/apache/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2024.12/fpm-alpine/Dockerfile

@@ -139,6 +139,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2024.12/fpm-alpine/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2024.12/fpm/Dockerfile

@@ -161,6 +161,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2024.12/fpm/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2026.01/apache/Dockerfile

@@ -169,6 +169,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2026.01/apache/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2026.01/fpm-alpine/Dockerfile

@@ -139,6 +139,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2026.01/fpm-alpine/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2026.01/fpm/Dockerfile

@@ -161,6 +161,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2026.01/fpm/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2026.04-dev/apache/Dockerfile

@@ -169,6 +169,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2026.04-dev/apache/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2026.04-dev/fpm-alpine/Dockerfile

@@ -139,6 +139,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2026.04-dev/fpm-alpine/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

2026.04-dev/fpm/Dockerfile

@@ -161,6 +161,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

2026.04-dev/fpm/config/zz-docker.config.php

@@ -12,7 +12,7 @@ $config = [
 		// Necessary because otherwise the daemon isn't working
 		'pidfile' => '/var/run/friendica.pid',
 
-		'logfile' => '/var/www/html/friendica.log',
+		'logfile' => '/var/log/friendica.log',
 		'loglevel' => 'notice',
 	],
 	'storage' => [

Dockerfile-alpine.template

@@ -137,6 +137,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data
 

Dockerfile-debian.template

@@ -159,6 +159,9 @@ RUN set -ex; \
     mkdir -p -m 775 /var/www/data; \
     chown -R www-data:www-data /var/www/data
 
+RUN set -ex; \
+    ln -sf /dev/stdout /var/log/friendica.log
+
 VOLUME /var/www/html
 VOLUME /var/www/data