Update templates for GitLab 7.1

Jacob Vosmaer
1 parent f4ca1cb9
Showing 2 changed files with 25 additions and 13 deletions Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -93,6 +93,7 @@ default[&#39;gitlab&#39;][&#39;gitlab-rails&#39;][&#39;ldap_allow_username_or_email_login&#39;] = nil
 default['gitlab']['gitlab-rails']['ldap_user_filter'] = nil
 default['gitlab']['gitlab-rails']['ldap_group_base'] = nil
 default['gitlab']['gitlab-rails']['ldap_admin_group'] = nil
+default['gitlab']['gitlab-rails']['ldap_sync_ssh_keys'] = nil
 default['gitlab']['gitlab-rails']['omniauth_enabled'] = false
 default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil
 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil
@@ -14,13 +14,13 @@ production: &amp;base
     port: <%= @gitlab_port %>
     https: <%= @gitlab_https %>
-    # Uncomment and customize the last line to run in a non-root path
-    # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. 
-    # Note that four settings need to be changed for this to work.
-    # 1) In your application.rb file: config.relative_url_root = "/gitlab"
-    # 2) In your gitlab.yml file: relative_url_root: /gitlab
-    # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
-    # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
+    # Uncommment this line below if your ssh host is different from HTTP/HTTPS one
+    # (you'd obviously need to replace ssh.host_example.com with your own host).
+    # Otherwise, ssh host will be set to the `host:` value above
+    # ssh_host: ssh.host_example.com
+
+    # WARNING: See config/application.rb under "Relative url support" for the list of
+    # other files that need to be changed for relative url support
     # relative_url_root: /gitlab
     # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
@@ -44,15 +44,16 @@ production: &amp;base
     ##   COLOR  = 5
     default_theme: <%= @gitlab_default_theme %> # default: 2
-
-    ## Users management
-    # default: false - Account passwords are not sent via the email if signup is enabled. 
+    ## Users can create accounts
+    # This also allows normal users to sign up for accounts themselves
+    # default: false - By default GitLab administrators must create all new accounts
     signup_enabled: <%= @gitlab_signup_enabled %>
     #
-    # default: true - If set to false, standard login form won't be shown on the sign-in page
+    ## Standard login settings
+    # The standard login can be disabled to force login via LDAP
+    # default: true - If set to false the standard login form won't be shown on the sign-in page
     signin_enabled: <%= @gitlab_signin_enabled %>
-
     # Restrict setting visibility levels for non-admin users.
     # The default is to allow all levels.
     restricted_visibility_levels: <%= @gitlab_restricted_visibility_levels unless @gitlab_restricted_visibility_levels.nil? %>
@@ -161,8 +162,18 @@ production: &amp;base
     #
     group_base: <%= single_quote(@ldap_group_base) %>
+    # LDAP group of users who should be admins in GitLab
+    #
+    #   Ex. GLAdmins
+    #
     admin_group: <%= single_quote(@ldap_admin_group) %>
+    # Name of attribute which holds a ssh public key of the user object.
+    # If false or nil, SSH key syncronisation will be disabled.
+    #
+    #   Ex. sshpublickey
+    #
+    sync_ssh_keys: <%= single_quote(@ldap_sync_ssh_keys) %>
   ## OmniAuth settings
   omniauth:
@@ -235,7 +246,7 @@ production: &amp;base
     # The next value is the maximum memory size grit can use
     # Given in number of bytes per git object (e.g. a commit)
     # This value can be increased if you have very large commits
-    max_size: <%= @git_max_size %> # 5.megabytes
+    max_size: <%= @git_max_size %>
     # Git timeout to read a commit, in seconds
     timeout: <%= @git_timeout %>