diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-17 02:54:48 +0400 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-17 02:54:48 +0400 |
| commit | 76329a46a3aca95f918b72936bcd884de4956ff3 (patch) | |
| tree | 0b5da5831173231ca7d4ca7927f72bc76fb0b9d5 /config | |
| parent | eea43c9412fcf1ce8de0230524114b2d643a0e0e (diff) | |
Fix settings
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 19 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
2 files changed, 14 insertions, 11 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 764718ff1db..4103550acdb 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -18,10 +18,13 @@ gitlab: host: localhost port: 80 https: false - # 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 + # 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 # 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 address used in the "From" field in mails sent by GitLab email_from: gitlab@localhost @@ -29,9 +32,6 @@ gitlab: ## Project settings default_projects_limit: 10 - ## Account used for GitLab installation ('gitlab' if undefined) - user: gitlab - ## Gravatar gravatar: enabled: true # Use user avatar images from Gravatar.com (default: true) @@ -88,8 +88,9 @@ omniauth: # ========================== # GitLab Satellites -satellites: - path: /home/gitlab/gitlab-satellites/ +satellites: + # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) + path: /home/gitlab/gitlab-satellites/ ## Backup settings backup: @@ -107,10 +108,12 @@ gitolite: receive_pack: true ssh_user: git ssh_host: localhost - group: git # default: 'git' if undefined # ssh_port: 22 # 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 # CAUTION! # Use the default values unless you really know what you are doing diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index d9d14b4ff8b..a076ef1d296 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -50,7 +50,7 @@ Settings.gitlab['relative_url_root'] ||= '' Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) -Settings.gitlab['user'] ||= 'gitlab' +Settings.gitlab['user'] ||= 'gitlab' Settings['gravatar'] ||= Settingslogic.new({}) 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_port'] ||= 22 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['backup'] ||= Settingslogic.new({}) @@ -81,4 +81,4 @@ Settings.git['bin_path'] ||= '/usr/bin/git' Settings.git['timeout'] ||= 10 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) |