Merge branch 'allow_setting_backup_keep_time' into 'master'

Allow Setting Backup Keep Time

Added backup_keep_time to allow for the setting of the backup keep_time.  Default is set to 0, which is the default if the setting is not in gitlab.yml.

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -90,6 +90,7 @@ default['gitlab']['gitlab-rails']['ldap_user_filter'] = ""
 default['gitlab']['gitlab-rails']['ldap_group_base'] = ""
 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
+default['gitlab']['gitlab-rails']['backup_keep_time'] = 0
 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/"
 default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/git-data/repositories"
 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/"

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -197,7 +197,7 @@ production: &base
   ## Backup settings
   backup:
     path: "<%= @backup_path %>"   # Relative paths are relative to Rails.root (default: tmp/backups/)
-    # keep_time: 604800   # default: 0 (forever) (in seconds)
+    keep_time: <%= @backup_keep_time %>   # default: 0 (forever) (in seconds)
   ## GitLab Shell settings
   gitlab_shell: