Commit 76329a46 authored by Riyad Preukschas's avatar Riyad Preukschas

Fix settings

parent eea43c94
...@@ -18,10 +18,13 @@ gitlab: ...@@ -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: ...@@ -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)
...@@ -89,6 +89,7 @@ omniauth: ...@@ -89,6 +89,7 @@ omniauth:
# GitLab Satellites # GitLab Satellites
satellites: satellites:
# Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
path: /home/gitlab/gitlab-satellites/ path: /home/gitlab/gitlab-satellites/
## Backup settings ## Backup settings
...@@ -107,10 +108,12 @@ gitolite: ...@@ -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
......
...@@ -68,7 +68,7 @@ Settings.gitolite['upload_pack'] ||= (Settings.gitolite['upload_pack'] != false ...@@ -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' ...@@ -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)
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