Download as
Browse Code »

Commit cca121520ea6ea8e345adbe61e3633fe6c7e3b49

Authored by Jacob Vosmaer
2 parents 8f1d1be1 f60dec5d
Exists in master and in 15 other branches 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

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.
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @cca1215
... ... @@ -90,6 +90,7 @@ default['gitlab']['gitlab-rails']['ldap_user_filter'] = ""
90 90 default['gitlab']['gitlab-rails']['ldap_group_base'] = ""
91 91 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
92 92 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
  93 +default['gitlab']['gitlab-rails']['backup_keep_time'] = 0
93 94 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/"
94 95 default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/git-data/repositories"
95 96 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/"
... ...
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @cca1215
... ... @@ -197,7 +197,7 @@ production: &base
197 197 ## Backup settings
198 198 backup:
199 199 path: "<%= @backup_path %>" # Relative paths are relative to Rails.root (default: tmp/backups/)
200   - # keep_time: 604800 # default: 0 (forever) (in seconds)
  200 + keep_time: <%= @backup_keep_time %> # default: 0 (forever) (in seconds)
201 201  
202 202 ## GitLab Shell settings
203 203 gitlab_shell:
... ...