Skip to content

Remove space from php-timezone sed pattern #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ostefano merged 19 commits into from
Mar 20, 2026
+1 −1
Merged

Remove space from php-timezone sed pattern #399

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
54f1808
Add timezone setting to template.env
LSI-ZuagrastaWastl Feb 14, 2026
9b9ff56
Add timezone environment variable to services
LSI-ZuagrastaWastl Feb 14, 2026
6f3aa89
Add PHP timezone config to docker-compose
LSI-ZuagrastaWastl Feb 14, 2026
2c8d4fd
Change PHP timezone variable and set localtime
LSI-ZuagrastaWastl Feb 25, 2026
f712ff7
Fix timezone setting in PHP configuration
LSI-ZuagrastaWastl Feb 25, 2026
dce5669
Change PHP_TIMEZONE variable to use TZ
LSI-ZuagrastaWastl Feb 25, 2026
da0e4e4
Remove tzone.ini configuration from docker-compose
LSI-ZuagrastaWastl Feb 25, 2026
25e999f
Change timezone setting to use update-alternatives
LSI-ZuagrastaWastl Mar 9, 2026
48e3c76
Merge branch 'master' into master
LSI-ZuagrastaWastl Mar 9, 2026
44f0c8c
sed TZ:UTC to TZ:-UTC
LSI-ZuagrastaWastl Mar 10, 2026
578b141
Change php-timezone variable to use TZ directly
LSI-ZuagrastaWastl Mar 10, 2026
98b1984
Remove PHP_TIMEZONE environment variable
LSI-ZuagrastaWastl Mar 10, 2026
ee22d13
Update PHP timezone configuration to TZ in entrypoint_fpm.sh
LSI-ZuagrastaWastl Mar 10, 2026
f611df2
Update timezone comment in template.env
LSI-ZuagrastaWastl Mar 10, 2026
dbb4031
Update timezone setting in entrypoint.sh
LSI-ZuagrastaWastl Mar 11, 2026
2441374
Merge branch 'MISP:master' into master
LSI-ZuagrastaWastl Mar 16, 2026
e83392b
Fix sed command for date.timezone configuration
LSI-ZuagrastaWastl Mar 16, 2026
4203c57
Merge branch 'MISP:master' into master
LSI-ZuagrastaWastl Mar 20, 2026
2a5eca5
Fix sed command for date.timezone configuration
LSI-ZuagrastaWastl Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/files/entrypoint_fpm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ change_php_vars() {
sed -i "s/session.sid_length = .*/session.sid_length = 64/" "$FILE"
sed -i "s/session.use_strict_mode = .*/session.use_strict_mode = 1/" "$FILE"
echo "Configure PHP | Setting 'date.timezone = ${TZ}'"
sed -i "s|^;date.timezone = .*|date.timezone = ${TZ}|" "$FILE"
Copy link
Copy Markdown
Collaborator

@ostefano ostefano Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to fix it?

My understanding is that, if this is never modified manually, it should work consistently?

Copy link
Copy Markdown
Contributor Author

@LSI-ZuagrastaWastl LSI-ZuagrastaWastl Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that, by default, the php.ini file does not appear to have a space after ;date.timezone =. As a result, the pattern does not recognize this line and does not set the value.

Without the space in the pattern, it is therefore more robust.

Copy link
Copy Markdown
Collaborator

@ostefano ostefano Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that is indeed annoying...

sed -i "s|^;date.timezone =.*|date.timezone = ${TZ}|" "$FILE"
done

for FILE in /etc/php/*/fpm/pool.d/www.conf
Expand Down
Loading