Commit edcb69c6 authored by Marin Jankovski's avatar Marin Jankovski

Add gravatar configuration options.

parent 582ba1c7
......@@ -75,6 +75,7 @@ default['gitlab']['user_can_create_group'] = true
default['gitlab']['user_can_change_username'] = true
default['gitlab']['default_theme'] = 2
default['gitlab']['standard_signin_enabled'] = true
default['gitlab']['repository_downloads_path'] = "tmp/repositories"
default['gitlab']['oauth_enabled'] = false
default['gitlab']['oauth_block_auto_created_users'] = true
default['gitlab']['oauth_allow_single_sign_on'] = false
......@@ -98,6 +99,8 @@ default['gitlab']['ldap']['allow_username_or_email_login'] = true
default['gitlab']['ldap']['user_filter'] = ''
default['gitlab']['gravatar'] = true
default['gitlab']['gravatar_plain_url'] = "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon"
default['gitlab']['gravatar_ssl_url'] = "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon"
default['gitlab']['default_projects_features']['issues'] = true
default['gitlab']['default_projects_features']['merge_requests'] = true
......
......@@ -27,6 +27,7 @@ template File.join(gitlab['path'], 'config', 'gitlab.yml') do
:user_can_change_username => gitlab['user_can_change_username'],
:default_theme => gitlab['default_theme'],
:standard_signin_enabled => gitlab['standard_signin_enabled'],
:repository_downloads_path => gitlab['repository_downloads_path'],
:oauth_enabled => gitlab['oauth_enabled'],
:oauth_block_auto_created_users => gitlab['oauth_block_auto_created_users'],
:oauth_allow_single_sign_on => gitlab['oauth_allow_single_sign_on'],
......@@ -35,6 +36,8 @@ template File.join(gitlab['path'], 'config', 'gitlab.yml') do
:sign_in_text => gitlab['extra']['sign_in_text'],
:default_projects_features => gitlab['default_projects_features'],
:gravatar => gitlab['gravatar'],
:gravatar_plain_url => gitlab['gravatar_plain_url'],
:gravatar_ssl_url => gitlab['gravatar_ssl_url'],
:ldap_config => gitlab['ldap'],
:ssh_port => gitlab['ssh_port'],
:backup => gitlab['backup'],
......
......@@ -32,6 +32,7 @@ describe "gitlab::install" do
user_can_change_username: true,
default_theme: 2,
standard_signin_enabled: true,
repository_downloads_path: 'tmp/repositories',
oauth_enabled: false,
oauth_block_auto_created_users: true,
oauth_allow_single_sign_on: false,
......@@ -46,19 +47,21 @@ describe "gitlab::install" do
"snippets"=>false,
"visibility_level"=>"private"
},
gravatar: true,
ldap_config: {
"enabled"=>false,
"host"=>"_your_ldap_server",
"base"=>"_the_base_where_you_search_for_users",
"port"=>636,
"uid"=>"sAMAccountName",
"method"=>"ssl",
"bind_dn"=>"_the_full_dn_of_the_user_you_will_bind_with",
"password"=>"_the_password_of_the_bind_user",
"allow_username_or_email_login"=>true,
"user_filter"=>""
},
gravatar: true,
gravatar_plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon",
gravatar_ssl_url: "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon",
ldap_config: {
"enabled"=>false,
"host"=>"_your_ldap_server",
"base"=>"_the_base_where_you_search_for_users",
"port"=>636,
"uid"=>"sAMAccountName",
"method"=>"ssl",
"bind_dn"=>"_the_full_dn_of_the_user_you_will_bind_with",
"password"=>"_the_password_of_the_bind_user",
"allow_username_or_email_login"=>true,
"user_filter"=>""
},
backup: {
"cron"=>{
"action"=>:create,
......@@ -460,6 +463,7 @@ describe "gitlab::install" do
user_can_change_username: true,
default_theme: 2,
standard_signin_enabled: true,
repository_downloads_path: 'tmp/repositories',
oauth_enabled: false,
oauth_block_auto_created_users: true,
oauth_allow_single_sign_on: false,
......@@ -474,19 +478,21 @@ describe "gitlab::install" do
"snippets"=>false,
"visibility_level"=>"private"
},
gravatar: true,
ldap_config: {
"enabled"=>false,
"host"=>"_your_ldap_server",
"base"=>"_the_base_where_you_search_for_users",
"port"=>636,
"uid"=>"sAMAccountName",
"method"=>"ssl",
"bind_dn"=>"_the_full_dn_of_the_user_you_will_bind_with",
"password"=>"_the_password_of_the_bind_user",
"allow_username_or_email_login"=>true,
"user_filter"=>""
},
gravatar: true,
gravatar_plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon",
gravatar_ssl_url: "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon",
ldap_config: {
"enabled"=>false,
"host"=>"_your_ldap_server",
"base"=>"_the_base_where_you_search_for_users",
"port"=>636,
"uid"=>"sAMAccountName",
"method"=>"ssl",
"bind_dn"=>"_the_full_dn_of_the_user_you_will_bind_with",
"password"=>"_the_password_of_the_bind_user",
"allow_username_or_email_login"=>true,
"user_filter"=>""
},
backup: {
"cron"=>{
"action"=>:create,
......
......@@ -81,7 +81,7 @@ production: &base
## Repository downloads directory
# When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
# The default is 'tmp/repositories' relative to the root of the Rails app.
# repository_downloads_path: tmp/repositories
repository_downloads_path: <%= @repository_downloads_path %> tmp/repositories
## External issues trackers
issues_tracker:
......@@ -116,8 +116,8 @@ production: &base
gravatar:
enabled: <%= @gravatar %> # Use user avatar image from Gravatar.com (default: true)
# gravatar urls: possible placeholders: %{hash} %{size} %{email}
# plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
plain_url: <%= @gravatar_plain_url %> # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
ssl_url: <%= @gravatar_ssl_url %> # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
#
# 2. Auth settings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment