diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-16 14:59:01 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-01 01:50:40 +0300 |
| commit | b27371d89848b35a1be06e253d0958f723fc242f (patch) | |
| tree | 5aebc0c5763b571fad2b0558912b202796af09a8 /config | |
| parent | fa68e403e0d5539b19ceb5396394d634babdc2b9 (diff) | |
Change pages domain to host
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index fa764844cb9..c6f06d43d07 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -162,7 +162,7 @@ production: &base # The domain under which the pages are served: # http://group.example.com/project # or project path can be a group page: group.example.com - domain: example.com + host: example.com port: 80 # Set to 443 if you serve the pages with HTTPS https: false # Set to true if you serve the pages with HTTPS diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 3932745e20c..b938a9cdb2a 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -264,7 +264,7 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path' Settings['pages'] ||= Settingslogic.new({}) Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? Settings.pages['path'] = File.expand_path('shared/pages/', Rails.root) -Settings.pages['domain'] ||= "example.com" +Settings.pages['host'] ||= "example.com" Settings.pages['https'] = false if Settings.pages['https'].nil? Settings.pages['port'] ||= Settings.pages.https ? 443 : 80 Settings.pages['protocol'] ||= Settings.pages.https ? "https" : "http" |