diff --git a/bundles/archive/files/archive b/bundles/archive/files/archive index d08c714..b476b18 100644 --- a/bundles/archive/files/archive +++ b/bundles/archive/files/archive @@ -1,6 +1,6 @@ #!/bin/bash -if [[ '$1' == 'perform' ]] +if [[ "$1" == 'perform' ]] then echo 'NON-DRY RUN' DRY='' @@ -22,6 +22,6 @@ gsutil ${'\\'} -e ${'\\'} -x '${'|'.join(conf['exclude'])}' ${'\\'} '${dir}' ${'\\'} - 'gs://${bucket}/${node.name}${dir}' - + 'gs://${bucket}/${node.name}${dir}' ${'\\'} + 2>&1 | tee | logger -t gsutil % endfor diff --git a/bundles/archive/items.py b/bundles/archive/items.py index 59d9b30..bd89dc9 100644 --- a/bundles/archive/items.py +++ b/bundles/archive/items.py @@ -7,7 +7,7 @@ files['/opt/archive'] = { 'dirs': node.metadata.get('archive'), 'bucket': node.metadata.get('gcloud/bucket'), 'processes': 4, - 'threads': 16, + 'threads': 4, }, 'needs': [ 'bundle:gcloud', diff --git a/bundles/gcloud/README.md b/bundles/gcloud/README.md index d964a08..c3faf72 100644 --- a/bundles/gcloud/README.md +++ b/bundles/gcloud/README.md @@ -4,4 +4,8 @@ gcloud projects add-iam-policy-binding sublimity-182017 --member 'serviceAccount gsutil -o "GSUtil:parallel_process_count=3" -o GSUtil:parallel_thread_count=4 -m rsync -r -d -e /var/vmail gs://sublimity-backup/mailserver gsutil config gsutil versioning set on gs://sublimity-backup + + + +gcsfuse --key-file /root/.config/gcloud/service_account.json sublimity-backup gcsfuse ```