github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FEATURE: Make the multisite config path configurable (#14308)

Browse Source
This commit is contained in:
Daniel Waterworth 2021-09-10 14:19:52 -05:00 committed by GitHub
parent 33fb3b7ec8
commit ceb234c2e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -323,7 +323,7 @@ GEM
activerecord (~> 6.0) activerecord (~> 6.0)
concurrent-ruby concurrent-ruby
railties (~> 6.0) railties (~> 6.0)
rails_multisite (3.0.0) rails_multisite (3.1.0)
activerecord (> 5.0, < 7) activerecord (> 5.0, < 7)
railties (> 5.0, < 7) railties (> 5.0, < 7)
railties (6.1.4.1) railties (6.1.4.1)

2
config/application.rb
View File

@ -99,6 +99,8 @@ module Discourse
config.skip_multisite_middleware = true config.skip_multisite_middleware = true
config.skip_rails_failover_active_record_middleware = true config.skip_rails_failover_active_record_middleware = true
config.multisite_config_path = File.absolute_path(GlobalSetting.multisite_config_path, Rails.root)
# Disable so this is only run manually # Disable so this is only run manually
# we may want to change this later on # we may want to change this later on
# issue is image_optim crashes on missing dependencies # issue is image_optim crashes on missing dependencies

3
config/discourse_defaults.conf
View File

@ -336,3 +336,6 @@ max_digests_enqueued_per_30_mins_per_site = 10000
# This cluster name can be passed to the /srv/status route to verify # This cluster name can be passed to the /srv/status route to verify
# the application cluster is the same one you are expecting # the application cluster is the same one you are expecting
cluster_name = cluster_name =
# The YAML file used to configure multisite clusters
multisite_config_path = config/multisite.yml