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

Author: serghey-rodin

func/rebuild.sh

@@ -455,7 +455,7 @@ rebuild_mail_domain_conf() {
         U_MAIL_DKMI=$((U_MAIL_DKMI + 1))
         pem="$USER_DATA/mail/$domain.pem"
         pub="$USER_DATA/mail/$domain.pub"
-        openssl genrsa -out $pem 512 &>/dev/null
+        openssl genrsa -out $pem 1024 &>/dev/null
         openssl rsa -pubout -in $pem -out $pub &>/dev/null
         cp $pem $HOMEDIR/$user/conf/mail/$domain/dkim.pem
 

install/vst-install-ubuntu.sh

@@ -618,6 +618,7 @@ wget $CHOST/$VERSION/apache2-pma.conf -O /etc/phpmyadmin/apache.conf
 wget $CHOST/$VERSION/pma.conf -O /etc/phpmyadmin/config.inc.php
 ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
 mv -f /etc/phpmyadmin/config-db.php /etc/phpmyadmin/config-db.php_
+chmod 777 /var/lib/phpmyadmin/tmp
 
 # Roundcube configuration
 wget $CHOST/$VERSION/apache2-webmail.conf -O /etc/roundcube/apache.conf