Просмотр исходного кода

Update PHP repository configuration

* Install PHP from ondrej/php repository by default
* Added language fix (add-apt-repository) on Ubuntu
Kristan Kenney 7 лет назад
Родитель
Сommit
81d1d753e1
2 измененных файлов с 10 добавлено и 12 удалено
  1. 6 7
      install/hst-install-debian.sh
  2. 4 5
      install/hst-install-ubuntu.sh

+ 6 - 7
install/hst-install-debian.sh

@@ -568,13 +568,12 @@ echo "deb [arch=amd64] http://nginx.org/packages/mainline/$VERSION/ $codename ng
 wget --quiet http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
 wget --quiet http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
 APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/nginx_signing.key > /dev/null 2>&1
 APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/nginx_signing.key > /dev/null 2>&1
 
 
-if [ "$multiphp" = 'yes' ] || [ "$phpfpm" = 'yes' ]; then
-    # Installing sury php repo
-    echo "(*) PHP"
-    echo "deb https://packages.sury.org/php/ $codename main" > $apt/php.list
-    wget --quiet https://packages.sury.org/php/apt.gpg -O /tmp/php_signing.key
-    APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/php_signing.key > /dev/null 2>&1
-fi
+# Installing sury php repo
+echo "(*) PHP"
+echo "deb https://packages.sury.org/php/ $codename main" > $apt/php.list
+wget --quiet https://packages.sury.org/php/apt.gpg -O /tmp/php_signing.key
+APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/php_signing.key > /dev/null 2>&1
+
 
 
 # Installing MariaDB repo
 # Installing MariaDB repo
 echo "(*) MariaDB"
 echo "(*) MariaDB"

+ 4 - 5
install/hst-install-ubuntu.sh

@@ -546,11 +546,10 @@ echo "deb [arch=amd64] http://nginx.org/packages/mainline/$VERSION/ $codename ng
 wget --quiet http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
 wget --quiet http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
 APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/nginx_signing.key > /dev/null 2>&1
 APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/nginx_signing.key > /dev/null 2>&1
 
 
-if [ "$multiphp" = 'yes' ] || [ "$phpfpm" = 'yes' ]; then
-    # Installing sury php repo
-    echo "(*) PHP"
-    add-apt-repository -y ppa:ondrej/php > /dev/null 2>&1
-fi
+# Installing sury php repo
+echo "(*) PHP"
+LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php > /dev/null 2>&1
+
 
 
 # Installing MariaDB repo
 # Installing MariaDB repo
 echo "(*) MariaDB"
 echo "(*) MariaDB"