fix: set date.timezone in PHP CLI php.ini#414
Open
LSI-ZuagrastaWastl wants to merge 24 commits into
Open
Conversation
Add timezone setting option to template.env
- Add timezone environment variable to all services - Setting Default to "UTC"
- 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.
Updated PHP timezone configuration and added symlink for timezone for supervisord.
sed dosen´t use "?" so PHP_TIMEZONE was setting in php.ini
PHP_TIMEZONE wasn`t in template.env and so most not in use. TZ Variable the global Timezone variable in this Project
Removed timezone configuration from docker-compose. With the "sed fix" in the entrypoint_fpm.sh, No need to mount a separate file now
Updated timezone setting method for supervisord compatibility with debian standard methode
add `-` so default (UTC) is in use, if TZ is not in use
PHP_timezone isn`t in use TZ exist
CET or CEST not useable timezone in /usr/share/zoneinfo/
Remove default value for TZ when setting timezone.
switch delimitter `/` to `|`
Remove the space from the pattern (`= .*` → `=.*`) to make it more flexible.
Remove setting of /etc/timezone for compatibility. It appears that not all Supervisors use the TZ value.
with this setting, MISP-Workers use Timezone from TZ
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
change_php_vars()only patcheddate.timezonein FPM'sphp.ini.PHP-CLI (used by MISP workers/console commands) kept the default UTC timezone, ignoring the
TZenv var.MISP background workers (e.g. CakePHP console commands) use the CLI SAPI and therefore ignore the FPM timezone config. As a result, all worker-generated timestamps use the container's default UTC regardless of the TZ environment variable.
Change
Added a loop to
entrypoint_fpm.shthat appliesdate.timezone = ${TZ}to all/etc/php/*/cli/php.inifiles, consistent with the existing FPM handling.Testing
TZto a time zone other thanUTC, e.g.:TZ=Europe/Berlinin the container environment.logs/misp-workers.logEurope/Berlin.Fixes #413
P.S. I thought creating a separate entrypoint script, such as
entrypoint_cli.sh, would be a bit too much overhead for a single change. If you ever want to modify or set more PHP CLI settings, this one will be moved along with them.