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 #1599 from ioannidesalex/patch-43

Browse source 
Cosmetic changes
This commit is contained in:
Serghey Rodin 2018-06-01 00:42:15 +03:00 • committed by GitHub
commit 5c7fd09642
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,7 @@ gen_pass() {
echo "$PASS" echo "$PASS"
} }
# Defning return code check function # Defining return code check function
check_result() { check_result() {
if [ $1 -ne 0 ]; then if [ $1 -ne 0 ]; then
echo "Error: $2" echo "Error: $2"
@ -122,7 +122,7 @@ set_default_value() {
fi fi
} }
# Define function to set default language value # Defining function to set default language value
set_default_lang() { set_default_lang() {
if [ -z "$lang" ]; then if [ -z "$lang" ]; then
eval lang=$1 eval lang=$1
@ -278,7 +278,7 @@ fi
wget -q "c.vestacp.com/deb_signing.key" -O /dev/null wget -q "c.vestacp.com/deb_signing.key" -O /dev/null
check_result $? "No access to Vesta repository" check_result $? "No access to Vesta repository"
# Check installed packages # Checking installed packages
tmpfile=$(mktemp -p /tmp) tmpfile=$(mktemp -p /tmp)
dpkg --get-selections > $tmpfile dpkg --get-selections > $tmpfile
for pkg in exim4 mysql-server apache2 nginx vesta; do for pkg in exim4 mysql-server apache2 nginx vesta; do
@ -319,7 +319,7 @@ echo
echo ' Vesta Control Panel' echo ' Vesta Control Panel'
echo -e "\n\n" echo -e "\n\n"
echo 'Following software will be installed on your system:' echo 'The following software will be installed on your system:'
# Web stack # Web stack
if [ "$nginx" = 'yes' ]; then if [ "$nginx" = 'yes' ]; then
@ -340,16 +340,16 @@ if [ "$named" = 'yes' ]; then
echo ' - Bind DNS Server' echo ' - Bind DNS Server'
fi fi
# Mail Stack # Mail stack
if [ "$exim" = 'yes' ]; then if [ "$exim" = 'yes' ]; then
echo -n ' - Exim mail server' echo -n ' - Exim Mail Server'
if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then
echo -n ' + ' echo -n ' + '
if [ "$clamd" = 'yes' ]; then if [ "$clamd" = 'yes' ]; then
echo -n 'Antivirus ' echo -n 'ClamAV'
fi fi
if [ "$spamd" = 'yes' ]; then if [ "$spamd" = 'yes' ]; then
echo -n 'Antispam' echo -n 'SpamAssassin'
fi fi
fi fi
echo echo
@ -358,7 +358,7 @@ if [ "$exim" = 'yes' ]; then
fi fi
fi fi
# DB stack # Database stack
if [ "$mysql" = 'yes' ]; then if [ "$mysql" = 'yes' ]; then
echo ' - MySQL Database Server' echo ' - MySQL Database Server'
fi fi
@ -491,16 +491,16 @@ cd $vst_backups
mkdir nginx apache2 php vsftpd proftpd bind exim4 dovecot clamd mkdir nginx apache2 php vsftpd proftpd bind exim4 dovecot clamd
mkdir spamassassin mysql postgresql mongodb vesta mkdir spamassassin mysql postgresql mongodb vesta
# Backing up nginx configuration # Backup nginx configuration
service nginx stop > /dev/null 2>&1 service nginx stop > /dev/null 2>&1
cp -r /etc/nginx/* $vst_backups/nginx >/dev/null 2>&1 cp -r /etc/nginx/* $vst_backups/nginx >/dev/null 2>&1
# Backing up Apache configuration # Backup Apache configuration
service apache2 stop > /dev/null 2>&1 service apache2 stop > /dev/null 2>&1
cp -r /etc/apache2/* $vst_backups/apache2 > /dev/null 2>&1 cp -r /etc/apache2/* $vst_backups/apache2 > /dev/null 2>&1
rm -f /etc/apache2/conf.d/* > /dev/null 2>&1 rm -f /etc/apache2/conf.d/* > /dev/null 2>&1
# Backing up PHP configuration # Backup PHP-FPM configuration
service php7.0-fpm stop > /dev/null 2>&1 service php7.0-fpm stop > /dev/null 2>&1
service php5-fpm stop > /dev/null 2>&1 service php5-fpm stop > /dev/null 2>&1
service php-fpm stop > /dev/null 2>&1 service php-fpm stop > /dev/null 2>&1
@ -508,11 +508,11 @@ cp -r /etc/php7.0/* $vst_backups/php/ > /dev/null 2>&1
cp -r /etc/php5/* $vst_backups/php/ > /dev/null 2>&1 cp -r /etc/php5/* $vst_backups/php/ > /dev/null 2>&1
cp -r /etc/php/* $vst_backups/php/ > /dev/null 2>&1 cp -r /etc/php/* $vst_backups/php/ > /dev/null 2>&1
# Backing up Bind configuration # Backup Bind configuration
service bind9 stop > /dev/null 2>&1 service bind9 stop > /dev/null 2>&1
cp -r /etc/bind/* $vst_backups/bind > /dev/null 2>&1 cp -r /etc/bind/* $vst_backups/bind > /dev/null 2>&1
# Backing up Vsftpd configuration # Backup Vsftpd configuration
service vsftpd stop > /dev/null 2>&1 service vsftpd stop > /dev/null 2>&1
cp /etc/vsftpd.conf $vst_backups/vsftpd > /dev/null 2>&1 cp /etc/vsftpd.conf $vst_backups/vsftpd > /dev/null 2>&1
@ -520,24 +520,24 @@ cp /etc/vsftpd.conf $vst_backups/vsftpd > /dev/null 2>&1
service proftpd stop > /dev/null 2>&1 service proftpd stop > /dev/null 2>&1
cp /etc/proftpd.conf $vst_backups/proftpd > /dev/null 2>&1 cp /etc/proftpd.conf $vst_backups/proftpd > /dev/null 2>&1
# Backing up Exim configuration # Backup Exim configuration
service exim4 stop > /dev/null 2>&1 service exim4 stop > /dev/null 2>&1
cp -r /etc/exim4/* $vst_backups/exim4 > /dev/null 2>&1 cp -r /etc/exim4/* $vst_backups/exim4 > /dev/null 2>&1
# Backing up ClamAV configuration # Backup ClamAV configuration
service clamav-daemon stop > /dev/null 2>&1 service clamav-daemon stop > /dev/null 2>&1
cp -r /etc/clamav/* $vst_backups/clamav > /dev/null 2>&1 cp -r /etc/clamav/* $vst_backups/clamav > /dev/null 2>&1
# Backing up SpamAssassin configuration # Backup SpamAssassin configuration
service spamassassin stop > /dev/null 2>&1 service spamassassin stop > /dev/null 2>&1
cp -r /etc/spamassassin/* $vst_backups/spamassassin > /dev/null 2>&1 cp -r /etc/spamassassin/* $vst_backups/spamassassin > /dev/null 2>&1
# Backing up Dovecot configuration # Backup Dovecot configuration
service dovecot stop > /dev/null 2>&1 service dovecot stop > /dev/null 2>&1
cp /etc/dovecot.conf $vst_backups/dovecot > /dev/null 2>&1 cp /etc/dovecot.conf $vst_backups/dovecot > /dev/null 2>&1
cp -r /etc/dovecot/* $vst_backups/dovecot > /dev/null 2>&1 cp -r /etc/dovecot/* $vst_backups/dovecot > /dev/null 2>&1
# Backing up MySQL/MariaDB configuration and data # Backup MySQL/MariaDB configuration and data
service mysql stop > /dev/null 2>&1 service mysql stop > /dev/null 2>&1
killall -9 mysqld > /dev/null 2>&1 killall -9 mysqld > /dev/null 2>&1
mv /var/lib/mysql $vst_backups/mysql/mysql_datadir > /dev/null 2>&1 mv /var/lib/mysql $vst_backups/mysql/mysql_datadir > /dev/null 2>&1
@ -549,7 +549,6 @@ if [ "$release" = '16.04' ] && [ -e '/etc/init.d/mysql' ]; then
mysqld --initialize-insecure mysqld --initialize-insecure
fi fi
# Backup Vesta # Backup Vesta
service vesta stop > /dev/null 2>&1 service vesta stop > /dev/null 2>&1
cp -r $VESTA/* $vst_backups/vesta > /dev/null 2>&1 cp -r $VESTA/* $vst_backups/vesta > /dev/null 2>&1
@ -668,7 +667,7 @@ rm -f /usr/sbin/policy-rc.d
sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config
service ssh restart service ssh restart
# Disable awstats cron # Disable AWStats cron
rm -f /etc/cron.d/awstats rm -f /etc/cron.d/awstats
# Set directory color # Set directory color
@ -677,7 +676,7 @@ echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile
# Register /usr/sbin/nologin # Register /usr/sbin/nologin
echo "/usr/sbin/nologin" >> /etc/shells echo "/usr/sbin/nologin" >> /etc/shells
# NTP Synchronization # NTP Sync
echo '#!/bin/sh' > /etc/cron.daily/ntpdate echo '#!/bin/sh' > /etc/cron.daily/ntpdate
echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate
chmod 775 /etc/cron.daily/ntpdate chmod 775 /etc/cron.daily/ntpdate