templates/script/backup-all-buckets.erb.sh

@@ -45,19 +45,17 @@ function do_backup {
 	local mountpoint="/opt/backupmounts/${bucket}"
 	ps aux | grep duplicity | grep "[^a-zA-Z]${bucket}" > /dev/null
 	local oktorun=$?   # 1 == this bucket has no other bakup process in progress
-  if [[ ${oktorun} -ne 0 ]]; then
 	mkdir -p ${mountpoint}
-    rclone mount ${project}:${bucket} ${mountpoint}/ --daemon --allow-other --dir-cache-time 24h
+	[[ ${oktorun} -ne 0 ]] && rclone mount ${project}:${bucket} ${mountpoint}/ --daemon --allow-other --dir-cache-time 24h
 	rclone mkdir ${mirror}:${mirrorbucket}
-    duplicity --full-if-older-than 1M --asynchronous-upload --tempdir /mnt --archive-dir /mnt --no-encryption ${mountpoint} rclone://${mirror}:/${mirrorbucket}
+	[[ ${oktorun} -ne 0 ]] && duplicity --full-if-older-than 1M --asynchronous-upload --tempdir /mnt --archive-dir /mnt \
-    if [[ "${extra_backup_jobs[${customer}]:+none}" != "none" ]]  && [[ -f "${extra_backup_jobs[${customer}]}" ]]; then
+		--no-encryption ${mountpoint} rclone://${mirror}:/${mirrorbucket} && \
-      ${extra_backup_jobs[${customer}]}
+    [[ -n "${extra_backup_jobs[${customer}]}" ]] && [[ -f ${extra_backup_jobs[${customer} ]] && ${extra_backup_jobs[${customer}]}
-    fi
 	umount ${mountpoint}
 	rmdir ${mountpoint}
 	# Clean up
-    duplicity remove-all-but-n-full ${number_of_full_to_keep} --tempdir /mnt --archive-dir /mnt --force rclone://${mirror}:/${mirrorbucket}
+	[ ${oktorun} -ne 0 ] && duplicity remove-all-but-n-full ${number_of_full_to_keep} --tempdir /mnt --archive-dir /mnt \
-  fi
+		--force rclone://${mirror}:/${mirrorbucket}
 }
 
 for entry in "${projects[@]}"; do

templates/script/create_folders_in_fullnode_buckets.erb.sh

@@ -25,7 +25,7 @@ dirty=0
 primary=''
 declare -a users=( 'admin' )
 cd "${tempdir}" || echo "Could not cd to tempdir"
-declare -a projects=( $("${yq}" -r '.project_mapping.'"${customer}"'.'"${environment}"'.assigned | "\(.[].project)"' /etc/hiera/data/common.yaml) )
+declare -a projects=( "${yq}" -r '.project_mapping.'"${customer}"'.'"${environment}"'.assigned | "\(.[].project)"' /etc/hiera/data/common.yaml )
 if [[ "${include_userbuckets}" == "true" ]]; then
 	primary=$("${yq}" -r '.project_mapping.'"${customer}"'.'"${environment}"'.primary_project' /etc/hiera/data/common.yaml)
 	projects+=( "${primary}" )