Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-16 17:48:39 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-16 17:48:39 +0300
commit623102d4556c42fd386e37724e638156dabca277 (patch)
treef621b38f0db3a81434bb3a50dfd22b6fe1ed2e9b /config
parent38b63393bb2841e471942a09b2fd188ca5df066b (diff)
Use registry.port to construct the registry host
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index d1fcb053bee..20f920ea854 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -249,9 +249,11 @@ Settings.artifacts['max_size'] ||= 100 # in megabytes
Settings['registry'] ||= Settingslogic.new({})
Settings.registry['enabled'] ||= false
Settings.registry['host'] ||= "example.com"
+Settings.registry['port'] ||= nil
Settings.registry['api_url'] ||= "http://localhost:5000/"
Settings.registry['key'] ||= nil
Settings.registry['issuer'] ||= nil
+Settings.registry['host_port'] ||= [Settings.registry['host'], Settings.registry['port']].join(':')
#
# Git LFS