Commit b27371d8 authored by Kamil Trzcinski's avatar Kamil Trzcinski Committed by James Edwards-Jones

Change pages domain to host

parent fa68e403
...@@ -1164,7 +1164,7 @@ class Project < ActiveRecord::Base ...@@ -1164,7 +1164,7 @@ class Project < ActiveRecord::Base
def pages_url def pages_url
if Dir.exist?(public_pages_path) if Dir.exist?(public_pages_path)
host = "#{namespace.path}.#{Settings.pages.domain}" host = "#{namespace.path}.#{Settings.pages.host}"
url = Gitlab.config.pages.url.sub(/^https?:\/\//) do |prefix| url = Gitlab.config.pages.url.sub(/^https?:\/\//) do |prefix|
"#{prefix}#{namespace.path}." "#{prefix}#{namespace.path}."
end end
......
...@@ -162,7 +162,7 @@ production: &base ...@@ -162,7 +162,7 @@ production: &base
# The domain under which the pages are served: # The domain under which the pages are served:
# http://group.example.com/project # http://group.example.com/project
# or project path can be a group page: group.example.com # 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 port: 80 # Set to 443 if you serve the pages with HTTPS
https: false # Set to true if you serve the pages with HTTPS https: false # Set to true if you serve the pages with HTTPS
......
...@@ -264,7 +264,7 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path' ...@@ -264,7 +264,7 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path'
Settings['pages'] ||= Settingslogic.new({}) Settings['pages'] ||= Settingslogic.new({})
Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? Settings.pages['enabled'] = false if Settings.pages['enabled'].nil?
Settings.pages['path'] = File.expand_path('shared/pages/', Rails.root) 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['https'] = false if Settings.pages['https'].nil?
Settings.pages['port'] ||= Settings.pages.https ? 443 : 80 Settings.pages['port'] ||= Settings.pages.https ? 443 : 80
Settings.pages['protocol'] ||= Settings.pages.https ? "https" : "http" Settings.pages['protocol'] ||= Settings.pages.https ? "https" : "http"
......
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