diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-12-27 17:36:08 +0100 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-12-27 17:36:08 +0100 |
| commit | 4ebd447a056ad3af624814ac3094ce132d38b1e9 (patch) | |
| tree | 9d90c6e3c90822782f1e430f941025e1f8094659 | |
| parent | a52746649d1db4f52ae4e989dcf654ef4af57905 (diff) | |
| download | gitlab-ce-4ebd447a056ad3af624814ac3094ce132d38b1e9.tar.gz | |
Use environment variables to configure GitLab.
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | doc/README.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 816cb0c02a9..c151ea01d55 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -144,7 +144,7 @@ Settings.gitlab['default_projects_limit'] ||= 10 Settings.gitlab['default_branch_protection'] ||= 2 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil? Settings.gitlab['default_theme'] = Gitlab::Themes::APPLICATION_DEFAULT if Settings.gitlab['default_theme'].nil? -Settings.gitlab['host'] ||= 'localhost' +Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost' Settings.gitlab['ssh_host'] ||= Settings.gitlab.host Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 diff --git a/doc/README.md b/doc/README.md index f40a257b42f..d82ff8b908b 100644 --- a/doc/README.md +++ b/doc/README.md @@ -56,6 +56,7 @@ - [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages. - [Libravatar](customization/libravatar.md) Use Libravatar for user avatars. - [Log system](logs/logs.md) Log system. +- [Environmental Variables](administration/environmental_variables.md) to configure GitLab. - [Operations](operations/README.md) Keeping GitLab up and running - [Raketasks](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects. - [Security](security/README.md) Learn what you can do to further secure your GitLab instance. |