deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix settings

Browse source
This commit is contained in:
Riyad Preukschas 2013-01-16 23:54:48 +01:00
parent eea43c9412
commit 76329a46a3
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
config/gitlab.yml.example
View file

@ -18,10 +18,13 @@ gitlab:
host: localhost host: localhost
port: 80 port: 80
https: false https: false
# uncomment and customize to run in non-root path # Uncomment and customize to run in non-root path
# note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
# relative_url_root: /gitlab # relative_url_root: /gitlab
# Uncomment and customize if you can't use the default user to run GitLab (default: 'gitlab')
# user: user123
## Email settings ## Email settings
# Email address used in the "From" field in mails sent by GitLab # Email address used in the "From" field in mails sent by GitLab
email_from: gitlab@localhost email_from: gitlab@localhost
@ -29,9 +32,6 @@ gitlab:
## Project settings ## Project settings
default_projects_limit: 10 default_projects_limit: 10
## Account used for GitLab installation ('gitlab' if undefined)
user: gitlab
## Gravatar ## Gravatar
gravatar: gravatar:
enabled: true # Use user avatar images from Gravatar.com (default: true) enabled: true # Use user avatar images from Gravatar.com (default: true)
@ -88,8 +88,9 @@ omniauth:
# ========================== # ==========================
# GitLab Satellites # GitLab Satellites
satellites: satellites:
path: /home/gitlab/gitlab-satellites/ # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
path: /home/gitlab/gitlab-satellites/
## Backup settings ## Backup settings
backup: backup:
@ -107,10 +108,12 @@ gitolite:
receive_pack: true receive_pack: true
ssh_user: git ssh_user: git
ssh_host: localhost ssh_host: localhost
group: git # default: 'git' if undefined
# ssh_port: 22 # ssh_port: 22
# config_file: gitolite.conf # config_file: gitolite.conf
# Uncomment and customize if you can't use the default group to own the repositories and run Gitolite (default: same as the 'ssh_user' above)
# owner_group: group123
## Git settings ## Git settings
# CAUTION! # CAUTION!
# Use the default values unless you really know what you are doing # Use the default values unless you really know what you are doing

6
config/initializers/1_settings.rb
View file

@ -50,7 +50,7 @@ Settings.gitlab['relative_url_root'] ||= ''
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
Settings.gitlab['user'] ||= 'gitlab' Settings.gitlab['user'] ||= 'gitlab'
Settings['gravatar'] ||= Settingslogic.new({}) Settings['gravatar'] ||= Settingslogic.new({})
Settings.gravatar['enabled'] ||= true Settings.gravatar['enabled'] ||= true
@ -68,7 +68,7 @@ Settings.gitolite['upload_pack'] ||= (Settings.gitolite['upload_pack'] != false
Settings.gitolite['ssh_host'] ||= (Settings.gitlab.host || 'localhost') Settings.gitolite['ssh_host'] ||= (Settings.gitlab.host || 'localhost')
Settings.gitolite['ssh_port'] ||= 22 Settings.gitolite['ssh_port'] ||= 22
Settings.gitolite['ssh_user'] ||= 'git' Settings.gitolite['ssh_user'] ||= 'git'
Settings.gitolite['group'] ||= 'git' Settings.gitolite['owner_group'] ||= Settings.gitolite.ssh_user
Settings.gitolite['ssh_path_prefix'] ||= Settings.send(:build_gitolite_ssh_path_prefix) Settings.gitolite['ssh_path_prefix'] ||= Settings.send(:build_gitolite_ssh_path_prefix)
Settings['backup'] ||= Settingslogic.new({}) Settings['backup'] ||= Settingslogic.new({})
@ -81,4 +81,4 @@ Settings.git['bin_path'] ||= '/usr/bin/git'
Settings.git['timeout'] ||= 10 Settings.git['timeout'] ||= 10
Settings['satellites'] ||= Settingslogic.new({}) Settings['satellites'] ||= Settingslogic.new({})
Settings.satellites['path'] ||= Rails.root.join('tmp/repo_satellites/') Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "tmp/repo_satellites/", Rails.root)