dont force ssl at rails level (let apache do it) and fix mastXdon spellin
This commit is contained in:
parent
e70c65219a
commit
25d9b1b5ba
|
@ -8,10 +8,10 @@ require 'mina/rbenv' # for rbenv support. (https://rbenv.org)
|
|||
# repository - Git repo to clone from. (needed by mina/git)
|
||||
# branch - Branch name to deploy. (needed by mina/git)
|
||||
|
||||
set :application_name, 'mastadon'
|
||||
set :application_name, 'mastodon'
|
||||
#set :domain, 'www.rubydesign.fi'
|
||||
set :domain, '95.217.60.123'
|
||||
set :deploy_to, '/home/feenix/mastadon'
|
||||
set :deploy_to, '/home/feenix/mastodon'
|
||||
set :repository, "https://github.com/FeenixMakers/mastodon.git"
|
||||
set :branch, 'feenix'
|
||||
|
||||
|
|
|
@ -40,14 +40,6 @@ Rails.application.configure do
|
|||
# Allow to specify public IP of reverse proxy if it's needed
|
||||
config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split(/(?:\s*,\s*|\s+)/).map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present?
|
||||
|
||||
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
|
||||
config.force_ssl = true
|
||||
config.ssl_options = {
|
||||
redirect: {
|
||||
exclude: -> request { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') || request.headers["Host"].end_with?('.i2p') }
|
||||
}
|
||||
}
|
||||
|
||||
# Include generic and useful information about system operation, but avoid logging too much
|
||||
# information to avoid inadvertent exposure of personally identifiable information (PII).
|
||||
# Use the lowest log level to ensure availability of diagnostic information
|
||||
|
|
Loading…
Reference in New Issue