From 553412b3d0ef2ff89ef123b74a1e556364543d54 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Sun, 7 Feb 2016 20:10:54 +0200 Subject: [PATCH] Update the template for DIY backup Updates according to the latest changes in master branch of DIY repo: https://bitbucket.org/atlassianlabs/atlassian-stash-diy-backup ref: eb9e5ba797d0b55eeb53376b95b167bb12dd1f76 --- templates/default/backup-diy-vars.sh.erb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/templates/default/backup-diy-vars.sh.erb b/templates/default/backup-diy-vars.sh.erb index c73e9ff..c7a61f0 100644 --- a/templates/default/backup-diy-vars.sh.erb +++ b/templates/default/backup-diy-vars.sh.erb @@ -5,10 +5,12 @@ # Local modifications will be overwritten by Chef. # -# Which database backup script to use (ex: mssql, postgresql, mysql) +CURL_OPTIONS="-L -s -f" + +# Which database backup script to use (ex: mssql, postgresql, mysql, ebs-collocated, rds) BACKUP_DATABASE_TYPE=<%= @database['type'] %> -# Which filesystem backup script to use (ex: rsync) +# Which filesystem backup script to use (ex: rsync, ebs-home) BACKUP_HOME_TYPE=<%= @backup_diy['backup_home_type'] %> # Which archive backup script to use (ex: tar, tar-gpg) @@ -17,9 +19,12 @@ BACKUP_ARCHIVE_TYPE=<%= @backup_diy['backup_archive_type'] %> # Used by the scripts for verbose logging. If not true only errors will be shown. STASH_VERBOSE_BACKUP=<%= @backup_diy['verbose'] ? 'TRUE' : 'FALSE' %> -# The base url used to access this stash instance +# The base url used to access this stash instance. It cannot end on a '/' STASH_URL=<%= @backup['baseurl'] %> +# Used in AWS backup / restore to tag snapshots. It cannot contain spaces and it must be under 100 characters long +INSTANCE_NAME=stash + # The username and password for the user used to make backups (and have this permission) STASH_BACKUP_USER=<%= @backup['user'] %> STASH_BACKUP_PASS=<%= @backup['password'] %>