github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 05:44:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16 from serghey-rodin/master

Browse source 
update from master
This commit is contained in:
myvesta 2018-08-12 03:35:52 +02:00 • committed by GitHub
commit 83e87a59f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-backup-user
View file

@ -393,6 +393,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then
dump="$tmpdir/db/$database/$database.$TYPE.sql" dump="$tmpdir/db/$database/$database.$TYPE.sql"
grants="$tmpdir/db/$database/conf/$database.$TYPE.$DBUSER" grants="$tmpdir/db/$database/conf/$database.$TYPE.$DBUSER"
if [ ! -f "$dump" ]; then
case $TYPE in case $TYPE in
mysql) dump_mysql_database ;; mysql) dump_mysql_database ;;
pgsql) dump_pgsql_database ;; pgsql) dump_pgsql_database ;;
@ -400,6 +401,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then
# Compress dump # Compress dump
gzip -$BACKUP_GZIP $dump gzip -$BACKUP_GZIP $dump
fi
done done
# Print total # Print total

14
install/vst-install-ubuntu.sh
View file

@ -626,15 +626,15 @@ fi
# Updating system # Updating system
apt-get update apt-get update
# Disabling daemon autostart /usr/share/doc/sysv-rc/README.policy-rc.d.gz # Disabling daemon autostart on apt-get install
#echo -e '#!/bin/sh \nexit 101' > /usr/sbin/policy-rc.d echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
#chmod a+x /usr/sbin/policy-rc.d chmod a+x /usr/sbin/policy-rc.d
# Installing apt packages # Installing apt packages
apt-get -y install $software apt-get -y install $software
check_result $? "apt-get install failed" check_result $? "apt-get install failed"
# Restoring policy # Restoring autostart policy
rm -f /usr/sbin/policy-rc.d rm -f /usr/sbin/policy-rc.d
@ -912,7 +912,7 @@ if [ -z "$ZONE" ]; then
ZONE='UTC' ZONE='UTC'
fi fi
for pconf in $(find /etc/php* -name php.ini); do for pconf in $(find /etc/php* -name php.ini); do
sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf sed -i "s%;date.timezone =%date.timezone = $ZONE%g" $pconf
sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf
done done
@ -1129,8 +1129,8 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
fi fi
cp -f $vestacp/roundcube/main.inc.php /etc/roundcube/ cp -f $vestacp/roundcube/main.inc.php /etc/roundcube/
cp -f $vestacp/roundcube/db.inc.php /etc/roundcube/ cp -f $vestacp/roundcube/db.inc.php /etc/roundcube/
chmod 640 /etc/roundcube/debian-db-roundcube.php chmod 640 /etc/roundcube/debian-db*
chown root:www-data /etc/roundcube/debian-db-roundcube.php chown root:www-data /etc/roundcube/debian-db*
cp -f $vestacp/roundcube/vesta.php \ cp -f $vestacp/roundcube/vesta.php \
/usr/share/roundcube/plugins/password/drivers/ /usr/share/roundcube/plugins/password/drivers/
cp -f $vestacp/roundcube/config.inc.php /etc/roundcube/plugins/password/ cp -f $vestacp/roundcube/config.inc.php /etc/roundcube/plugins/password/