Fix bug in upgrade script

install/deb/nginx/webmail.inc

@@ -1,15 +0,0 @@
-location /webmail {
-    alias /var/lib/roundcube/;
-
-    location ~ /(config|temp|logs) {
-        return 404;
-    }
-
-    location ~ ^/webmail/(.*\.php)$ {
-        alias /var/lib/roundcube/$1;
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $request_filename;
-    }
-}

install/upgrade/0.9.8-29.sh

@@ -174,13 +174,16 @@ if [ -f /etc/dovecot/dovecot.conf ]; then
 fi
 
 # Update Roundcube webmail configuration
-if [ -f /etc/apache2/conf.d/webmail.conf ]; then
+if [ -f /etc/apache2/conf.d/roundcube.conf ]; then
     echo "(*) Updating Roundcube global subdomain configuration for apache2..."
-    cp -f $HESTIA/install/deb/roundcube/apache.conf /etc/apache2/conf.d/roundcube.conf.conf
+    cp -f $HESTIA/install/deb/roundcube/apache.conf /etc/apache2/conf.d/roundcube.conf
 fi
-if [ -f /etc/nginx/conf.d/webmail.inc ]; then
+
+if [ ! -z "$PROXY_SYSTEM" ]; then
     echo "(*) Updating Roundcube global subdomain configuration for nginx..."
-    rm -f /etc/nginx/conf.d/webmail.inc
+    if [ -f /etc/nginx/conf.d/webmail.inc ]; then
+        rm -f /etc/nginx/conf.d/webmail.inc
+    fi
     cp -f $HESTIA/install/deb/nginx/webmail.conf /etc/nginx/conf.d/webmail.conf
 fi