Merge branch 'add_settings_from_gitlab_yml' into 'master'

Add settings from gitlab yml

Fixes #480

See merge request !306

Makefile

@@ -1,5 +1,9 @@
 PROJECT=gitlab
-RELEASE_BUCKET=downloads-packages
+ifndef TESTBUCKET
+	RELEASE_BUCKET=downloads-packages
+else
+	RELEASE_BUCKET=omnibus-builds
+endif
 RELEASE_BUCKET_REGION=eu-west-1
 SECRET_DIR:=$(shell openssl rand -hex 20)
 PLATFORM_DIR:=$(shell ruby -rjson -e 'puts JSON.parse(`bin/ohai`).values_at("platform", "platform_version").join("-")')
@@ -9,6 +13,8 @@ build:
 
 do_release: no_changes on_tag purge build move_to_platform_dir sync
 
+do_packages: no_changes purge build move_to_platform_dir sync
+
 no_changes:
 	git diff --quiet HEAD
 

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

@@ -14,6 +14,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['time_zone'] = 'UTC'
 # gitlab_rails['gitlab_email_enabled'] = true
 # gitlab_rails['gitlab_email_from'] = 'example@example.com'
+# gitlab_rails['gitlab_email_display_name'] = 'Example'
 # gitlab_rails['gitlab_default_can_create_group'] = true
 # gitlab_rails['gitlab_username_changing_enabled'] = true
 # gitlab_rails['gitlab_default_theme'] = 2
@@ -134,6 +135,14 @@ external_url 'GENERATED_EXTERNAL_URL'
 #   'PATH' => "/opt/gitlab/bin:/opt/gitlab/embedded/bin:/bin:/usr/bin"
 # }
 
+# gitlab_rails['rack_attack_git_basic_auth'] = {
+#   'enabled' => true,
+#   'ip_whitelist' => ["127.0.0.1"],
+#   'maxretry' => 10,
+#   'findtime' => 60,
+#   'bantime' => 3600
+# }
+
 # We do not recommend changing these directories.
 # gitlab_rails['dir'] = "/var/opt/gitlab/gitlab-rails"
 # gitlab_rails['log_directory'] = "/var/log/gitlab/gitlab-rails"

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

@@ -64,6 +64,7 @@ default['gitlab']['gitlab-rails']['gitlab_https'] = false
 default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil
 default['gitlab']['gitlab-rails']['time_zone'] = nil
 default['gitlab']['gitlab-rails']['gitlab_email_from'] = nil
+default['gitlab']['gitlab-rails']['gitlab_email_display_name'] = nil
 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
 default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil
 default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil
@@ -125,6 +126,7 @@ default['gitlab']['gitlab-rails']['extra_google_analytics_id'] = nil
 default['gitlab']['gitlab-rails']['extra_piwik_url'] = nil
 default['gitlab']['gitlab-rails']['extra_piwik_site_id'] = nil
 default['gitlab']['gitlab-rails']['extra_sign_in_text'] = nil
+default['gitlab']['gitlab-rails']['rack_attack_git_basic_auth'] = nil
 
 default['gitlab']['gitlab-rails']['aws_enable'] = false
 default['gitlab']['gitlab-rails']['aws_access_key_id'] = nil

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

@@ -34,6 +34,7 @@ production: &base
     email_enabled: <%= @gitlab_email_enabled %>
     # Email address used in the "From" field in mails sent by GitLab
     email_from: <%= @gitlab_email_from %>
+    email_display_name: <%= @gitlab_email_display_name %>
 
     # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
 
@@ -221,6 +222,10 @@ production: &base
     <% end %>
     <% end %>
 
+    rack_attack:
+      git_basic_auth: <%= @rack_attack_git_basic_auth.to_json if @rack_attack_git_basic_auth %>
+
+
 development:
   <<: *base