nginx section before apache

This commit is contained in:
Serghey Rodin 2013-09-26 21:43:00 +03:00
commit 7b03aac587

View file

@ -458,6 +458,18 @@ sed -i 's/#allowsftp/allowsftp/' /etc/rssh.conf
sed -i 's/#allowrsync/allowrsync/' /etc/rssh.conf
chmod 755 /usr/bin/rssh
# Nginx configuration
rm -f /etc/nginx/conf.d/*.conf
wget $CHOST/$VERSION/nginx.conf -O /etc/nginx/nginx.conf
wget $CHOST/$VERSION/nginx-status.conf -O /etc/nginx/conf.d/status.conf
touch /etc/nginx/conf.d/vesta.conf
chkconfig nginx on
service nginx start
if [ "$?" -ne 0 ]; then
echo "Error: nginx start failed"
exit 1
fi
# Apache configuration
wget $CHOST/$VERSION/httpd.conf -O /etc/httpd/conf/httpd.conf
wget $CHOST/$VERSION/httpd-status.conf -O /etc/httpd/conf.d/status.conf
@ -484,18 +496,6 @@ if [ "$?" -ne 0 ]; then
exit 1
fi
# Nginx configuration
rm -f /etc/nginx/conf.d/*.conf
wget $CHOST/$VERSION/nginx.conf -O /etc/nginx/nginx.conf
wget $CHOST/$VERSION/nginx-status.conf -O /etc/nginx/conf.d/status.conf
touch /etc/nginx/conf.d/vesta.conf
chkconfig nginx on
service nginx start
if [ "$?" -ne 0 ]; then
echo "Error: nginx start failed"
exit 1
fi
# Vsftpd configuration
wget $CHOST/$VERSION/vsftpd.conf -O /etc/vsftpd/vsftpd.conf
chkconfig vsftpd on