Drop support for Google Cloud drive for backups (#3205)

* Drop support for backup / restore from Google Cloud storage
* Add notice for active users
* Fix broken tests

bin/v-backup-user

@@ -715,7 +715,6 @@ for backup_type in $(echo -e "${BACKUP_SYSTEM//,/\\n}"); do
 		local) local_backup ;;
 		ftp) ftp_backup ;;
 		sftp) sftp_backup ;;
-		google) google_backup ;;
 		b2) b2_backup ;;
 		rclone) rclone_backup ;;
 	esac

bin/v-import-cpanel

@@ -244,19 +244,6 @@ for folder in *; do
 done
 echo "All mail accounts restored"
 
-cd ../ssl/
-mv ./keys/* ./certs/
-ls ./certs/
-
-cat ssl.db
-domains=$(/usr/local/hestia/bin/v-list-web-domains $new_user plain | awk '{ print  $1 }')
-
-for domain in $domains; do
-	if [ -e ./sslcerts/$domain.key ]; then
-		v-add-web-domain-ssl $user $domain $(pwd)/sslcerts/
-	fi
-done
-
 rm -rf "$tmpdir"
 
 echo "##############################"

bin/v-restart-dns

@@ -56,7 +56,6 @@ if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
 	exit
 fi
 
-
 if [ -e '/etc/named.conf' ]; then
 	dns_conf='/etc/named.conf'
 else

bin/v-restore-user

@@ -69,10 +69,6 @@ fi
 
 # Checking local backup
 if [ ! -e "$BACKUP/$backup" ]; then
-	if [[ "$BACKUP_SYSTEM" =~ "google" ]]; then
-		google_download "$backup"
-		downloaded='yes'
-	fi
 	if [[ "$BACKUP_SYSTEM" =~ "sftp" ]] && [ -z "$downloaded" ]; then
 		sftp_download "$backup"
 		downloaded='yes'

func/backup.sh

@@ -442,56 +442,6 @@ sftp_backup() {
 	fi
 }
 
-# Google backup download function
-google_backup() {
-
-	# Defining google settings
-	source_conf "$HESTIA/conf/google.backup.conf"
-	gsutil="$HESTIA/3rdparty/gsutil/gsutil"
-	export BOTO_CONFIG="$HESTIA/conf/.google.backup.boto"
-
-	# Debug info
-	echo -e "$(date "+%F %T") Remote: gs://$BUCKET/$BPATH/$user.$backup_new_date.tar"
-
-	# Checking retention
-	backup_list=$(${gsutil} ls gs://$BUCKET/$BPATH/$user.* 2> /dev/null)
-	backups_count=$(echo "$backup_list" | wc -l)
-	if [ "$backups_count" -ge "$BACKUPS" ]; then
-		backups_rm_number=$((backups_count - BACKUPS))
-		for backup in $(echo "$backup_list" | head -n $backups_rm_number); do
-			echo -e "$(date "+%F %T") Rotated gcp backup: $backup"
-			$gsutil rm $backup > /dev/null 2>&1
-		done
-	fi
-
-	# Uploading backup archive
-	echo -e "$(date "+%F %T") Uploading $user.$backup_new_date.tar ..."
-	if [ "$localbackup" = 'yes' ]; then
-		cd $BACKUP
-		${gsutil} cp $user.$backup_new_date.tar gs://$BUCKET/$BPATH/ > /dev/null 2>&1
-	else
-		cd $tmpdir
-		tar -cf $BACKUP/$user.$backup_new_date.tar .
-		cd $BACKUP/
-		${gsutil} cp $user.$backup_new_date.tar gs://$BUCKET/$BPATH/ > /dev/null 2>&1
-		rc=$?
-		rm -f $user.$backup_new_date.tar
-		if [ "$rc" -ne 0 ]; then
-			check_result "$E_CONNECT" "gsutil failed to upload $user.$backup_new_date.tar"
-		fi
-	fi
-}
-
-google_download() {
-	source_conf "$HESTIA/conf/google.backup.conf"
-	gsutil="$HESTIA/3rdparty/gsutil/gsutil"
-	export BOTO_CONFIG="$HESTIA/conf/.google.backup.boto"
-	${gsutil} cp gs://$BUCKET/$BPATH/$1 $BACKUP/ > /dev/null 2>&1
-	if [ "$?" -ne 0 ]; then
-		check_result "$E_CONNECT" "gsutil failed to download $1"
-	fi
-}
-
 # BackBlaze B2 backup function
 b2_backup() {
 	# Defining backblaze b2 settings

install/upgrade/versions/1.7.0.sh

@@ -66,3 +66,8 @@ for file in /etc/php/*/fpm/pool.d/www.conf; do
 	echo "[ * ] Update $file legacy /var/run/ to /run/"
 	sed -i 's|/var/run/|/run/|g' $file
 done
+
+if echo "$BACKUP_SYSTEM" | grep "google" > /dev/null; then
+	echo "[ ! ] Deprecation notice: Backup via Google Cloud has been removed setup backup again via Rclone to reinstate the backup and restore capebilities!"
+	add_upgrade_message "Deprecation notice: Backup via Google Cloud has been removed setup backup again via Rclone to reinstate the backup and restore capebilities!"
+fi

test/test.bats

@@ -1492,8 +1492,13 @@ function check_ip_not_banned(){
     refute_output
 }
 
+@test "MAIL: Add account (duplicate)" {
+	run v-add-mail-account $user $domain test "$userpass2"
+	assert_failure $E_EXISTS
+}
+
 @test "MAIL: Add account alias" {
-	run v-add-mail-account $user $domain test hestiacprocks
+	run v-add-mail-account-alias $user $domain test hestiacprocks
 	assert_success
 	assert_file_contains /etc/exim4/domains/$domain/aliases "hestiacprocks@$domain"
 	refute_output
@@ -1517,11 +1522,6 @@ function check_ip_not_banned(){
 	assert_failure $E_EXISTS
 }
 
-@test "MAIL: Add account (duplicate)" {
-    run v-add-mail-account-alias $user $domain test "$userpass2"
-    assert_failure $E_EXISTS
-}
-
 @test "MAIL: change mail account password" {
   run curl -k -X POST -d "email=test@$domain&password=$userpass2&new=123456" https://localhost:8083/reset/mail/
   assert_success