From 79f912702ad32f7693d59b28fc886056be2bcc9a Mon Sep 17 00:00:00 2001 From: Nicolas CARPi Date: Wed, 12 Jul 2023 11:54:30 +0200 Subject: [PATCH] awk sk can have a slash, so use sed with | separator. fix elabftw/elabftw#4471 --- CHANGELOG.md | 1 + src/init/prepare.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e110583..cdd6f50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ # 4.4.1 +* Fix issue with AWS Secret Key containing a slash (fix elabftw/elabftw#4471) * Fix `set_real_ip` nginx module not working with CIDR notation # 4.4.0 diff --git a/src/init/prepare.sh b/src/init/prepare.sh index ac252f5..9e55b19 100755 --- a/src/init/prepare.sh +++ b/src/init/prepare.sh @@ -342,8 +342,8 @@ populatePhpEnv() { sed -i -e "s#%SITE_URL%#${site_url}#" /etc/php81/php-fpm.d/elabpool.conf # assume that if ak is set, then sk is too if [ -n "$aws_ak" ]; then - sed -i -e "s/%ELAB_AWS_ACCESS_KEY%/${aws_ak}/" /etc/php81/php-fpm.d/elabpool.conf - sed -i -e "s/%ELAB_AWS_SECRET_KEY%/${aws_sk}/" /etc/php81/php-fpm.d/elabpool.conf + sed -i -e "s|%ELAB_AWS_ACCESS_KEY%|${aws_ak}|" /etc/php81/php-fpm.d/elabpool.conf + sed -i -e "s|%ELAB_AWS_SECRET_KEY%|${aws_sk}|" /etc/php81/php-fpm.d/elabpool.conf else sed -i -e "/%ELAB_AWS_ACCESS_KEY%/d" /etc/php81/php-fpm.d/elabpool.conf sed -i -e "/%ELAB_AWS_SECRET_KEY%/d" /etc/php81/php-fpm.d/elabpool.conf