Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure correct '/'s for relative_url_root in route file

This commit is contained in:
Blake Erickson 2018-04-10 14:24:29 -06:00
parent 2fd31f2b2a
commit 0337a8f6d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/discourse_defaults.conf
View File

@ -151,7 +151,7 @@ connection_reaper_max_age = 600
# set to relative URL (for subdirectory hosting) # set to relative URL (for subdirectory hosting)
# IMPORTANT: path must not include a trailing / # IMPORTANT: path must not include a trailing /
# EG: /forum # EG: /forum
relative_url_root = relative_url_root = /forum
# increasing this number will increase redis memory use # increasing this number will increase redis memory use
# this ensures backlog (ability of channels to catch up are capped) # this ensures backlog (ability of channels to catch up are capped)

6
config/routes.rb
View File

@ -10,7 +10,7 @@ USERNAME_ROUTE_FORMAT = /[\w.\-]+?/ unless defined? USERNAME_ROUTE_FORMAT
BACKUP_ROUTE_FORMAT = /.+\.(sql\.gz|tar\.gz|tgz)/i unless defined? BACKUP_ROUTE_FORMAT BACKUP_ROUTE_FORMAT = /.+\.(sql\.gz|tar\.gz|tgz)/i unless defined? BACKUP_ROUTE_FORMAT
Discourse::Application.routes.draw do Discourse::Application.routes.draw do
relative_url_root = (defined?(Rails.configuration.relative_url_root) && Rails.configuration.relative_url_root) ? Rails.configuration.relative_url_root : '' relative_url_root = (defined?(Rails.configuration.relative_url_root) && Rails.configuration.relative_url_root) ? Rails.configuration.relative_url_root + '/' : '/'
match "/404", to: "exceptions#not_found", via: [:get, :post] match "/404", to: "exceptions#not_found", via: [:get, :post]
get "/404-body" => "exceptions#not_found_body" get "/404-body" => "exceptions#not_found_body"
@ -550,7 +550,7 @@ Discourse::Application.routes.draw do
get "/badges/:id(/:slug)" => "badges#show" get "/badges/:id(/:slug)" => "badges#show"
resources :user_badges, only: [:index, :create, :destroy] resources :user_badges, only: [:index, :create, :destroy]
get '/c', to: redirect('/' + relative_url_root + 'categories') get '/c', to: redirect(relative_url_root + 'categories')
resources :categories, except: :show resources :categories, except: :show
post "category/:category_id/move" => "categories#move" post "category/:category_id/move" => "categories#move"
@ -732,7 +732,7 @@ Discourse::Application.routes.draw do
# current site before updating to a new Service Worker. # current site before updating to a new Service Worker.
# Support the old Service Worker path to avoid routing error filling up the # Support the old Service Worker path to avoid routing error filling up the
# logs. # logs.
get "/service-worker.js" => redirect('/' + relative_url_root + service_worker_asset), format: :js get "/service-worker.js" => redirect(relative_url_root + service_worker_asset), format: :js
get service_worker_asset => "static#service_worker_asset", format: :js get service_worker_asset => "static#service_worker_asset", format: :js
end end