Skip to content
Permalink
Browse files

udapted package defenition

  • Loading branch information...
Serghey Rodin
Serghey Rodin committed Jun 13, 2018
1 parent e08a123 commit ee03eff016e03cb76fac7ae3a0f9d1ef0f8ee35b
Showing with 19 additions and 41 deletions.
  1. +19 −41 install/vst-install-ubuntu.sh
@@ -18,45 +18,24 @@ release="$(lsb_release -s -r)"
codename="$(lsb_release -s -c)"
vestacp="$VESTA/install/$VERSION/$release"

if [ "$release" = '16.04' ] || [ "$release" = '18.04' ]; then
software="nginx apache2 apache2-utils apache2.2-common
apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf
libapache2-mod-fcgid libapache2-mod-php php php-common php-cgi
php-mysql php-curl php-fpm php-pgsql awstats webalizer vsftpd
proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
spamassassin dovecot-imapd dovecot-pop3d roundcube-core
roundcube-mysql roundcube-plugins mysql-server mysql-common
mysql-client postgresql postgresql-contrib phppgadmin phpmyadmin mc
flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
bsdmainutils cron vesta vesta-nginx vesta-php expect vim-common
vesta-ioncube vesta-softaculous apparmor-utils"
elif [ "$release" = '16.10' ] || [ "$release" = '17.10' ]; then
software="nginx apache2 apache2-utils apache2.2-common
apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf
libapache2-mod-fcgid libapache2-mod-php7.0 php7.0 php7.0-common
php7.0-cgi php7.0-mysql php7.0-curl php7.0-fpm php7.0-pgsql awstats
webalizer vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core
roundcube-mysql roundcube-plugins mysql-server mysql-common
mysql-client postgresql postgresql-contrib phppgadmin phpmyadmin mc
flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
bsdmainutils cron vesta vesta-nginx vesta-php expect vim-common
vesta-ioncube vesta-softaculous apparmor-utils"
else
software="nginx apache2 apache2-utils apache2.2-common
apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf
libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd
proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
spamassassin dovecot-imapd dovecot-pop3d roundcube-core
roundcube-mysql roundcube-plugins mysql-server mysql-common
mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc
flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
bsdmainutils cron vesta vesta-nginx vesta-php expect vim-common
vesta-ioncube vesta-softaculous"
# Defining software pack for all distros
software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
apparmor-utils awstats bc bind9 bsdmainutils bsdutils clamav-daemon
cron curl dnsutils dovecot-imapd dovecot-pop3d e2fslibs e2fsprogs exim4
exim4-daemon-heavy expect fail2ban flex ftp git idn imagemagick
libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf
libapache2-mod-ruid2 lsof mc mysql-client mysql-common mysql-server nginx
ntpdate php-cgi php-common php-curl php-fpm phpmyadmin php-mysql
phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota
roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
sudo vesta vesta-ioncube vesta-nginx vesta-php vesta-softaculous
vim-common vsftpd webalizer whois zip"

# Fix for old releases
if [[ ${release:0:2} -lt 16 ]]; then
software=$(echo "$software" |sed -e "s/php /php5 /")
software=$(echo "$software" |sed -e "s/php-/php5-/")
software=$(echo "$software" |sed -e "s/mod-php/mod-php5/")
fi

# Defining help function
@@ -1267,7 +1246,6 @@ fi

# Adding default domain
$VESTA/bin/v-add-domain admin $servername
codename="$codename:$(echo $vpass:$servername | base64)"

# Adding cron jobs
command="sudo $VESTA/bin/v-update-sys-queue disk"
@@ -1320,7 +1298,7 @@ $VESTA/bin/v-add-cron-vesta-autoupdate
wget vestacp.com/notify/?$codename -O /dev/null -q

# Comparing hostname and IP
host_ip=$(host $servername| head -n 1 | awk '{print $NF}')
host_ip=$(host $servername| head -n 1 |awk '{print $NF}')
if [ "$host_ip" = "$ip" ]; then
ip="$servername"
fi

0 comments on commit ee03eff

Please sign in to comment.
You can’t perform that action at this time.