Skip to content

Commit 81d1d75

Browse files
author
Kristan Kenney
committed
Update PHP repository configuration
* Install PHP from ondrej/php repository by default * Added language fix (add-apt-repository) on Ubuntu
1 parent 714f2c6 commit 81d1d75

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

install/hst-install-debian.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -568,13 +568,12 @@ echo "deb [arch=amd64] http://nginx.org/packages/mainline/$VERSION/ $codename ng
568568
wget --quiet http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
569569
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/nginx_signing.key > /dev/null 2>&1
570570

571-
if [ "$multiphp" = 'yes' ] || [ "$phpfpm" = 'yes' ]; then
572-
# Installing sury php repo
573-
echo "(*) PHP"
574-
echo "deb https://packages.sury.org/php/ $codename main" > $apt/php.list
575-
wget --quiet https://packages.sury.org/php/apt.gpg -O /tmp/php_signing.key
576-
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/php_signing.key > /dev/null 2>&1
577-
fi
571+
# Installing sury php repo
572+
echo "(*) PHP"
573+
echo "deb https://packages.sury.org/php/ $codename main" > $apt/php.list
574+
wget --quiet https://packages.sury.org/php/apt.gpg -O /tmp/php_signing.key
575+
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/php_signing.key > /dev/null 2>&1
576+
578577

579578
# Installing MariaDB repo
580579
echo "(*) MariaDB"

install/hst-install-ubuntu.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -546,11 +546,10 @@ echo "deb [arch=amd64] http://nginx.org/packages/mainline/$VERSION/ $codename ng
546546
wget --quiet http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
547547
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/nginx_signing.key > /dev/null 2>&1
548548

549-
if [ "$multiphp" = 'yes' ] || [ "$phpfpm" = 'yes' ]; then
550-
# Installing sury php repo
551-
echo "(*) PHP"
552-
add-apt-repository -y ppa:ondrej/php > /dev/null 2>&1
553-
fi
549+
# Installing sury php repo
550+
echo "(*) PHP"
551+
LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php > /dev/null 2>&1
552+
554553

555554
# Installing MariaDB repo
556555
echo "(*) MariaDB"

0 commit comments

Comments
 (0)