From 7b03aac587cc7272949b388fba97e750f3a2b2b8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 26 Sep 2013 21:43:00 +0300 Subject: [PATCH] nginx section before apache --- install/vst-install.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/install/vst-install.sh b/install/vst-install.sh index 80032db06..202f25a76 100644 --- a/install/vst-install.sh +++ b/install/vst-install.sh @@ -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