From dec562b8a1d276176e04a6f30407b6707c241149 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 5 Jun 2013 17:07:03 +0300
Subject: [PATCH] no mail graps yet

---
 bin/v-list-sys-rrd     | 6 +++---
 install/vst-install.sh | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/v-list-sys-rrd b/bin/v-list-sys-rrd
index 68eb4a8c6..49b0b2e78 100755
--- a/bin/v-list-sys-rrd
+++ b/bin/v-list-sys-rrd
@@ -88,9 +88,9 @@ if [ -n "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
     rrd_types="$rrd_types db"
 fi
 
-if [ -n "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
-    rrd_types="$rrd_types mail"
-fi
+#if [ -n "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
+#    rrd_types="$rrd_types mail"
+#fi
 
 if [ -n "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" != 'no' ]; then
     rrd_types="$rrd_types ftp"
diff --git a/install/vst-install.sh b/install/vst-install.sh
index 5ba5e8a05..4a9fe94d9 100644
--- a/install/vst-install.sh
+++ b/install/vst-install.sh
@@ -9,7 +9,7 @@ export PATH=$PATH:/sbin
 RHOST='r.vestacp.com'
 CHOST='c.vestacp.com'
 REPO='cmmnt'
-VERSION='0.9.7'
+VERSION='0.9.8/rhel'
 YUM_REPO='/etc/yum.repos.d/vesta.repo'
 arch=$(uname -i)
 os=$(cut -f 1 -d ' ' /etc/redhat-release)
@@ -634,7 +634,7 @@ sed -i "s/%blowfish_secret%/$(gen_pass)/g" /etc/phpMyAdmin/config.inc.php
 # Roundcube configuration
 wget $CHOST/$VERSION/httpd-webmail.conf -O /etc/httpd/conf.d/roundcubemail.conf
 wget $CHOST/$VERSION/roundcube-main.conf -O /etc/roundcubemail/main.inc.php
-wget $CHOST/$VERSION/roundcube-db.conf -O /etc/roundcubemail/db.inc.php
+wget $CHOST/D$VERSION/roundcube-db.conf -O /etc/roundcubemail/db.inc.php
 wget $CHOST/$VERSION/roundcube-driver.php -O \
     /usr/share/roundcubemail/plugins/password/drivers/vesta.php
 wget $CHOST/$VERSION/roundcube-pw.conf -O \
@@ -700,7 +700,7 @@ chmod -R 755 /usr/local/vesta/data/templates
 cp templates/web/skel/public_html/index.html /var/www/html/
 sed -i 's/%domain%/It worked!/g' /var/www/html/index.html
 if [ "$srv_type" = 'micro' ]; then
-    rm -f /usr/local/vesta/data/templates/web/apache_phpfcgid.*
+    rm -f /usr/local/vesta/data/templates/web/httpd/phpfcgid.*
 fi
 
 # Default SSL keys
@@ -725,7 +725,7 @@ $VESTA/bin/v-change-user-shell admin bash
 $VESTA/bin/v-change-user-language admin en
 
 # Configure mysql host
-$VESTA/bin/v-add-database-server mysql localhost root $mpass
+$VESTA/bin/v-add-database-host mysql localhost root $mpass
 $VESTA/bin/v-add-database admin default default $(gen_pass) mysql
 
 # Configuring system ips