Parcourir la source

Merge branch 'staging/maintenance' into releases/v1.1

Kristan Kenney il y a 5 ans
Parent
commit
fa7a1129a1
2 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 3 3
      install/hst-install-debian.sh
  2. 1 1
      install/hst-install-ubuntu.sh

+ 3 - 3
install/hst-install-debian.sh

@@ -37,7 +37,7 @@ if [ "$release" -eq 8 ]; then
         mariadb-server postgresql postgresql-contrib phppgadmin phpMyAdmin mc
         mariadb-server postgresql postgresql-contrib phppgadmin phpMyAdmin mc
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
         e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
         e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
-        bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
+        bsdmainutils cron hestia=1.1.1 hestia-nginx hestia-php expect libmail-dkim-perl
         unrar-free vim-common acl sysstat setpriv"
         unrar-free vim-common acl sysstat setpriv"
 elif [ "$release" -eq 9 ]; then
 elif [ "$release" -eq 9 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom
     software="nginx apache2 apache2-utils apache2-suexec-custom
@@ -53,7 +53,7 @@ elif [ "$release" -eq 9 ]; then
         mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
         mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
         e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
         e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
-        bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
+        bsdmainutils cron hestia=1.1.1 hestia-nginx hestia-php expect libmail-dkim-perl
         unrar-free vim-common acl sysstat rsyslog setpriv"
         unrar-free vim-common acl sysstat rsyslog setpriv"
 elif [ "$release" -eq 10 ]; then
 elif [ "$release" -eq 10 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom
     software="nginx apache2 apache2-utils apache2-suexec-custom
@@ -69,7 +69,7 @@ elif [ "$release" -eq 10 ]; then
         mariadb-server postgresql postgresql-contrib phpmyadmin phppgadmin mc
         mariadb-server postgresql postgresql-contrib phpmyadmin phppgadmin mc
         flex whois git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs
         flex whois git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs
         bsdutils e2fsprogs curl imagemagick fail2ban dnsutils bsdmainutils cron
         bsdutils e2fsprogs curl imagemagick fail2ban dnsutils bsdmainutils cron
-        hestia hestia-nginx hestia-php expect libmail-dkim-perl unrar-free
+        hestia=1.1.1 hestia-nginx hestia-php expect libmail-dkim-perl unrar-free
         vim-common acl sysstat rsyslog util-linux"
         vim-common acl sysstat rsyslog util-linux"
 fi
 fi
 
 

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -40,7 +40,7 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
     php$fpm_v-mbstring php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline
     php$fpm_v-mbstring php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline
     php$fpm_v-xml postgresql postgresql-contrib proftpd-basic quota
     php$fpm_v-xml postgresql postgresql-contrib proftpd-basic quota
     roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
     roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
-    sudo hestia hestia-nginx hestia-php vim-common vsftpd whois zip acl sysstat setpriv"
+    sudo hestia=1.1.1 hestia-nginx hestia-php vim-common vsftpd whois zip acl sysstat setpriv"
 
 
 # Defining help function
 # Defining help function
 help() {
 help() {