Skip to content

Commit a4e7a00

Browse files
Remove space from php-timezone sed pattern (#399)
* Add timezone setting to template.env Add timezone setting option to template.env * Add timezone environment variable to services - Add timezone environment variable to all services - Setting Default to "UTC" * Add PHP timezone config to docker-compose - Add timezone configuration for PHP in docker-compose file. - Replace PHP timezone in misp-core with the new config-file tzone.ini Perhaps there are better solutions for changing the time zone from PHP during runtime. * Change PHP timezone variable and set localtime Updated PHP timezone configuration and added symlink for timezone for supervisord. * Fix timezone setting in PHP configuration sed dosen´t use "?" so PHP_TIMEZONE was setting in php.ini * Change PHP_TIMEZONE variable to use TZ PHP_TIMEZONE wasn`t in template.env and so most not in use. TZ Variable the global Timezone variable in this Project * Remove tzone.ini configuration from docker-compose Removed timezone configuration from docker-compose. With the "sed fix" in the entrypoint_fpm.sh, No need to mount a separate file now * Change timezone setting to use update-alternatives Updated timezone setting method for supervisord compatibility with debian standard methode * sed TZ:UTC to TZ:-UTC add `-` so default (UTC) is in use, if TZ is not in use * Change php-timezone variable to use TZ directly * Remove PHP_TIMEZONE environment variable PHP_timezone isn`t in use TZ exist * Update PHP timezone configuration to TZ in entrypoint_fpm.sh * Update timezone comment in template.env CET or CEST not useable timezone in /usr/share/zoneinfo/ * Update timezone setting in entrypoint.sh Remove default value for TZ when setting timezone. * Fix sed command for date.timezone configuration switch delimitter `/` to `|` * Fix sed command for date.timezone configuration Remove the space from the pattern (`= .*` → `=.*`) to make it more flexible.
1 parent 4bbd01a commit a4e7a00

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

core/files/entrypoint_fpm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ change_php_vars() {
4747
sed -i "s/session.sid_length = .*/session.sid_length = 64/" "$FILE"
4848
sed -i "s/session.use_strict_mode = .*/session.use_strict_mode = 1/" "$FILE"
4949
echo "Configure PHP | Setting 'date.timezone = ${TZ}'"
50-
sed -i "s|^;date.timezone = .*|date.timezone = ${TZ}|" "$FILE"
50+
sed -i "s|^;date.timezone =.*|date.timezone = ${TZ}|" "$FILE"
5151
done
5252

5353
for FILE in /etc/php/*/fpm/pool.d/www.conf

0 commit comments

Comments
 (0)