github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #822 from prodimon/master

Browse source 
mini fix
This commit is contained in:
Serghey Rodin 2016-08-29 16:51:57 +03:00 • committed by GitHub
commit 73177fe22c
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
func/main.sh
View file

@ -1,3 +1,4 @@
#!/usr/bin/env bash
# Internal variables # Internal variables
HOMEDIR='/home' HOMEDIR='/home'
BACKUP='/backup' BACKUP='/backup'
@ -448,6 +449,7 @@ sync_cron_jobs() {
rm -f $crontab rm -f $crontab
if [ "$CRON_REPORTS" = 'yes' ]; then if [ "$CRON_REPORTS" = 'yes' ]; then
echo "MAILTO=$CONTACT" > $crontab echo "MAILTO=$CONTACT" > $crontab
echo 'CONTENT_TYPE="text/plain; charset=utf-8"' >> $crontab
fi fi
while read line; do while read line; do
eval $line eval $line

4
install/vst-install-debian.sh
View file

@ -28,7 +28,7 @@ if [ "$release" -eq 8 ]; then
mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc mysql-client 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 vesta vesta-nginx vesta-php" bsdmainutils cron vesta vesta-nginx vesta-php expect"
else else
software="nginx apache2 apache2-utils apache2.2-common software="nginx apache2 apache2-utils apache2.2-common
apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf
@ -40,7 +40,7 @@ else
mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc mysql-client 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 vesta vesta-nginx vesta-php" bsdmainutils cron vesta vesta-nginx vesta-php expect"
fi fi
# Defining help function # Defining help function

4
install/vst-install-rhel.sh
View file

@ -26,7 +26,7 @@ if [ "$release" -eq 7 ]; then
postgresql postgresql-server postgresql-contrib phpPgAdmin e2fsprogs postgresql postgresql-server postgresql-contrib phpPgAdmin e2fsprogs
openssh-clients ImageMagick curl mc screen ftp zip unzip flex sqlite pcre openssh-clients ImageMagick curl mc screen ftp zip unzip flex sqlite pcre
sudo bc jwhois mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype sudo bc jwhois mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype
fail2ban rsyslog iptables-services which vesta vesta-nginx vesta-php" fail2ban rsyslog iptables-services which vesta vesta-nginx vesta-php expect"
else else
software="nginx httpd mod_ssl mod_ruid2 mod_fcgid mod_extract_forwarded software="nginx httpd mod_ssl mod_ruid2 mod_fcgid mod_extract_forwarded
php php-common php-cli php-bcmath php-gd php-imap php-mbstring php-mcrypt php php-common php-cli php-bcmath php-gd php-imap php-mbstring php-mcrypt
@ -36,7 +36,7 @@ else
postgresql-server postgresql-contrib phpPgAdmin e2fsprogs openssh-clients postgresql-server postgresql-contrib phpPgAdmin e2fsprogs openssh-clients
ImageMagick curl mc screen ftp zip unzip flex sqlite pcre sudo bc jwhois ImageMagick curl mc screen ftp zip unzip flex sqlite pcre sudo bc jwhois
mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype fail2ban mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype fail2ban
which vesta vesta-nginx vesta-php" which vesta vesta-nginx vesta-php expect"
fi fi
# Defining help function # Defining help function

2
install/vst-install-ubuntu.sh
View file

@ -26,7 +26,7 @@ software="nginx apache2 apache2-utils apache2.2-common
mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc mysql-client 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 vesta vesta-nginx vesta-php" bsdmainutils cron vesta vesta-nginx vesta-php expect"
# Defining help function # Defining help function
help() { help() {