Add settings for recaptcha.

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

@@ -78,6 +78,12 @@ external_url 'GENERATED_EXTERNAL_URL'
 ## GitLab Pages
 # gitlab_rails['pages_path'] = "/mnt/storage/pages"
+## reCAPTCHA
+# gitlab_rails['recaptcha_enabled'] = false
+# gitlab_rails['recaptcha_public_key'] = 'PUBLICKEY'
+# gitlab_rails['recaptcha_private_key'] = 'PRIVATEKEY'
+
+
 ## For setting up LDAP
 ## see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/629def0a7a26e7c2326566f0758d4a27857b52a3/README.md#setting-up-ldap-sign-in
 ## Be careful not to break the identation in the ldap_servers block. It is in

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

@@ -109,6 +109,9 @@ default['gitlab']['gitlab-rails']['pages_https'] = false
 default['gitlab']['gitlab-rails']['pages_path'] = nil
 default['gitlab']['gitlab-rails']['ldap_enabled'] = false
 default['gitlab']['gitlab-rails']['ldap_servers'] = []
+default['gitlab']['gitlab-rails']['recaptcha_enabled'] = false
+default['gitlab']['gitlab-rails']['recaptcha_public_key'] = ""
+default['gitlab']['gitlab-rails']['recaptcha_private_key'] = ""
 ####
 # These LDAP settings are deprecated in favor of the new syntax. They are kept here for backwards compatibility.

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

@@ -268,6 +268,12 @@ production: &base
       - <%= provider.to_json %>
 <% end %>
+  # reCAPTCHA settings. See: http://www.google.com/recaptcha
+  recaptcha:
+    enabled: <%= @recaptcha_enabled %>
+    public_key: <%= single_quote(@recaptcha_public_key) %>
+    private_key: <%= single_quote(@recaptcha_private_key) %>
+
   # Shared file storage settings
   shared:
     path: <%= @shared_path %>