Merge pull request #177 from linuxserver/3.21-php-timezone

Fix timezone overwriting php-local.ini contents
linuxserver · Dec 22, 2024 · a037650 · a037650
2 parents fdf4c99 + 7c90557
commit a037650
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/root/etc/s6-overlay/s6-rc.d/init-php/run b/root/etc/s6-overlay/s6-rc.d/init-php/run
@@ -9,11 +9,10 @@ fi
 # create local php.ini if it doesn't exist, set local timezone
 if [[ ! -f /config/php/php-local.ini ]]; then
     printf "; Edit this file to override php.ini directives\\n\\n" >/config/php/php-local.ini
+    # set default timezone
+    printf "date.timezone = %s\\n" "${TZ:-UTC}" >/config/php/php-local.ini
 fi
 
-# set default timezone
-printf "date.timezone = %s\\n" "${TZ:-UTC}" >/config/php/php-local.ini
-
 # create override for www.conf if it doesn't exist
 if [[ ! -f /config/php/www2.conf ]]; then
     printf "; Edit this file to override www.conf and php-fpm.conf directives and restart the container\\n\\n; Pool name\\n[www]\\n\\n" >/config/php/www2.conf