Browse Source

Change installation way of ondrej php repository.

Raphael Schneeberger 7 years ago
parent
commit
71c133a0e7
1 changed files with 7 additions and 3 deletions
  1. 7 3
      install/hst-install-ubuntu.sh

+ 7 - 3
install/hst-install-ubuntu.sh

@@ -270,6 +270,12 @@ if [ ! -e '/usr/lib/apt/methods/https' ]; then
     check_result $? "Can't install apt-transport-https"
     check_result $? "Can't install apt-transport-https"
 fi
 fi
 
 
+# Check if apt-add-repository is installed
+if [ ! -e '/usr/bin/apt-add-repository' ]; then
+    apt-get -y install python-software-properties
+    check_result $? "Can't install python-software-properties"
+fi
+
 # Checking repository availability
 # Checking repository availability
 wget -q "https://$GPG/deb_signing.key" -O /dev/null
 wget -q "https://$GPG/deb_signing.key" -O /dev/null
 check_result $? "No access to Hestia repository"
 check_result $? "No access to Hestia repository"
@@ -478,9 +484,7 @@ wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
 apt-key add /tmp/nginx_signing.key
 apt-key add /tmp/nginx_signing.key
 
 
 # Installing sury php repo
 # Installing sury php repo
-echo "deb https://packages.sury.org/php/ $codename main" > $apt/php.list
-wget https://packages.sury.org/php/apt.gpg -O /tmp/php_signing.key
-apt-key add /tmp/php_signing.key
+add-apt-repository -y ppa:ondrej/php > /dev/null 2>&1
 
 
 # Installing hestia repo
 # Installing hestia repo
 echo "deb https://$RHOST/ $codename main" > $apt/hestia.list
 echo "deb https://$RHOST/ $codename main" > $apt/hestia.list