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

Merge branch 'master' of github.com:serghey-rodin/vesta

Browse source
This commit is contained in:
Dmitry Naumov-Socolov 2016-10-20 04:09:43 -04:00
commit d61b4f3159
1 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ vestacp="http://$CHOST/$VERSION/$release"
if [ "$release" -eq 8 ]; then if [ "$release" -eq 8 ]; then
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-fcgid libapache2-mod-php5 php5 php5-common php5-cgi libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd
proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
@ -32,7 +32,7 @@ if [ "$release" -eq 8 ]; then
bsdmainutils cron vesta vesta-nginx vesta-php expect" 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-fcgid libapache2-mod-php5 php5 php5-common php5-cgi libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd
proftpd-basic proftpd-mod-vroot bind9 exim4 exim4-daemon-heavy proftpd-basic proftpd-mod-vroot bind9 exim4 exim4-daemon-heavy
@ -527,7 +527,6 @@ if [ "$apache" = 'no' ]; then
software=$(echo "$software" | sed -e "s/apache2-suexec-custom//") software=$(echo "$software" | sed -e "s/apache2-suexec-custom//")
software=$(echo "$software" | sed -e "s/apache2.2-common//") software=$(echo "$software" | sed -e "s/apache2.2-common//")
software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//") software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//") software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
software=$(echo "$software" | sed -e "s/libapache2-mod-php5//") software=$(echo "$software" | sed -e "s/libapache2-mod-php5//")
fi fi
@ -830,6 +829,7 @@ if [ "$apache" = 'yes' ]; then
a2enmod ssl a2enmod ssl
a2enmod actions a2enmod actions
a2enmod ruid2 a2enmod ruid2
a2enmod headers
mkdir -p /etc/apache2/conf.d mkdir -p /etc/apache2/conf.d
echo > /etc/apache2/conf.d/vesta.conf echo > /etc/apache2/conf.d/vesta.conf
echo "# Powered by vesta" > /etc/apache2/sites-available/default echo "# Powered by vesta" > /etc/apache2/sites-available/default
@ -1164,9 +1164,9 @@ $VESTA/bin/v-change-user-language admin $lang
# RoundCube permissions fix # RoundCube permissions fix
if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
if [ ! -d "/var/log/roundcube" ]; then if [ ! -d "/var/log/roundcube" ]; then
mkdir /var/log/roundcube mkdir /var/log/roundcube
fi fi
chown admin:admin /var/log/roundcube chown admin:admin /var/log/roundcube
fi fi
@ -1175,17 +1175,39 @@ $VESTA/bin/v-update-sys-ip
# Get main ip # Get main ip
ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
copy_of_ip=$ip
# Firewall configuration
if [ "$iptables" = 'yes' ]; then
$VESTA/bin/v-update-firewall
fi
# Get public ip # Get public ip
pub_ip=$(curl -s vestacp.com/what-is-my-ip/) pub_ip=$(curl -s vestacp.com/what-is-my-ip/)
if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
$VESTA/bin/v-change-sys-ip-nat $ip $pub_ip $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip
ip=$pub_ip ip=$pub_ip
fi fi
# Firewall configuration # Configuring libapache2-mod-remoteip
if [ "$iptables" = 'yes' ]; then if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then
$VESTA/bin/v-update-firewall copy_of_pub_ip=$pub_ip
echo "<IfModule mod_remoteip.c>" > /etc/apache2/mods-available/remoteip.conf
echo " RemoteIPHeader X-Real-IP" >> /etc/apache2/mods-available/remoteip.conf
if [ "$copy_of_ip" != "127.0.0.1" ] && [ "$copy_of_pub_ip" != "127.0.0.1" ]; then
echo " RemoteIPInternalProxy 127.0.0.1" >> /etc/apache2/mods-available/remoteip.conf
fi
if [ ! -z "$copy_of_ip" ] && [ "$copy_of_ip" != "$copy_of_pub_ip" ]; then
echo " RemoteIPInternalProxy $copy_of_ip" >> /etc/apache2/mods-available/remoteip.conf
fi
if [ ! -z "$copy_of_pub_ip" ]; then
echo " RemoteIPInternalProxy $copy_of_pub_ip" >> /etc/apache2/mods-available/remoteip.conf
fi
echo "</IfModule>" >> /etc/apache2/mods-available/remoteip.conf
sed -i "s/LogFormat \"%h/LogFormat \"%a/g" /etc/apache2/apache2.conf
a2enmod remoteip
service apache2 restart
fi fi
# Configuring mysql host # Configuring mysql host