Merge branch 'backup_archive_permissions' into 'master'

Add backup_archive_permissions option to configuration.

Fixes #701

See merge request !430

files/gitlab-config-template/gitlab.rb.template

@@ -108,6 +108,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 ## see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/629def0a7a26e7c2326566f0758d4a27857b52a3/README.md#backups
 
 # gitlab_rails['backup_path'] = "/var/opt/gitlab/backups"
+# gitlab_rails['backup_archive_permissions'] = 0644 # See: http://doc.gitlab.com/ce/raketasks/backup_restore.html#backup-archive-permissions
 # gitlab_rails['backup_keep_time'] = 604800
 # gitlab_rails['backup_upload_connection'] = {
 #   'provider' => 'AWS',
@@ -586,4 +587,4 @@ external_url 'GENERATED_EXTERNAL_URL'
 # ci_nginx['gzip_proxied'] = "any"
 # ci_nginx['gzip_types'] = [ "text/plain", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript", "application/json" ]
 # ci_nginx['keepalive_timeout'] = 65
-# ci_nginx['cache_max_size'] = '5000m'
+# ci_nginx['cache_max_size'] = '5000m'

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

@@ -118,6 +118,7 @@ default['gitlab']['gitlab-rails']['bitbucket'] = nil
 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
 default['gitlab']['gitlab-rails']['satellites_timeout'] = nil
 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
+default['gitlab']['gitlab-rails']['backup_archive_permissions'] = nil
 default['gitlab']['gitlab-rails']['backup_keep_time'] = nil
 default['gitlab']['gitlab-rails']['backup_upload_connection'] = nil
 default['gitlab']['gitlab-rails']['backup_upload_remote_directory'] = nil

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

@@ -173,6 +173,7 @@ production: &base
   ## Backup settings
   backup:
     path: "<%= @backup_path %>"   # Relative paths are relative to Rails.root (default: tmp/backups/)
+    archive_permissions: <%= @backup_archive_permissions %> # Permissions for the resulting backup.tar file (default: 0600)
     keep_time: <%= @backup_keep_time %>   # default: 0 (forever) (in seconds)
     upload:
       # Fog storage connection settings, see http://fog.io/storage/ .