diff options
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/neography.rb | 5 | ||||
| -rw-r--r-- | config/initializers/ostatus.rb | 16 | ||||
| -rw-r--r-- | config/initializers/paperclip.rb | 4 | ||||
| -rw-r--r-- | config/initializers/rack-attack.rb | 4 | ||||
| -rw-r--r-- | config/initializers/timeout.rb | 1 |
5 files changed, 15 insertions, 15 deletions
diff --git a/config/initializers/neography.rb b/config/initializers/neography.rb deleted file mode 100644 index bd6ead3b0..000000000 --- a/config/initializers/neography.rb +++ /dev/null @@ -1,5 +0,0 @@ -Neography.configure do |config| - config.protocol = "http" - config.server = ENV.fetch('NEO4J_HOST') { 'localhost' } - config.port = ENV.fetch('NEO4J_PORT') { 7474 } -end diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index 3dd501b65..4ba432b6a 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -1,14 +1,16 @@ -port = ENV.fetch('PORT') { 3000 } - +port = ENV.fetch('PORT') { 3000 } +host = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" } +https = ENV['LOCAL_HTTPS'] == 'true' + Rails.application.configure do - config.x.local_domain = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" } - config.x.hub_url = ENV.fetch('HUB_URL') { 'https://pubsubhubbub.superfeedr.com' } - config.x.use_https = ENV['LOCAL_HTTPS'] == 'true' + config.x.local_domain = host + config.x.hub_url = ENV.fetch('HUB_URL') { 'https://pubsubhubbub.superfeedr.com' } + config.x.use_https = https config.x.use_s3 = ENV['S3_ENABLED'] == 'true' - config.action_mailer.default_url_options = { host: config.x.local_domain, protocol: config.x.use_https ? 'https://' : 'http://', trailing_slash: false } + config.action_mailer.default_url_options = { host: host, protocol: https ? 'https://' : 'http://', trailing_slash: false } if Rails.env.production? - config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"] + config.action_cable.allowed_request_origins = ["http#{https ? 's' : ''}://#{host}"] end end diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 643c5d384..80effc05e 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -1,4 +1,6 @@ if ENV['S3_ENABLED'] == 'true' + Aws.eager_autoload!(services: %w(S3)) + Paperclip::Attachment.default_options[:storage] = :s3 Paperclip::Attachment.default_options[:s3_protocol] = 'https' Paperclip::Attachment.default_options[:url] = ':s3_domain_url' @@ -9,6 +11,6 @@ if ENV['S3_ENABLED'] == 'true' bucket: ENV.fetch('S3_BUCKET'), access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'), secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'), - s3_region: ENV.fetch('S3_REGION') + s3_region: ENV.fetch('S3_REGION'), } end diff --git a/config/initializers/rack-attack.rb b/config/initializers/rack-attack.rb index 6d9286e66..3f0ee1d7a 100644 --- a/config/initializers/rack-attack.rb +++ b/config/initializers/rack-attack.rb @@ -1,7 +1,7 @@ class Rack::Attack # Rate limits for the API throttle('api', limit: 150, period: 5.minutes) do |req| - req.ip if req.path.match(/\A\/api\//) + req.ip if req.path.match(/\A\/api\/v/) end self.throttled_response = lambda do |env| @@ -11,7 +11,7 @@ class Rack::Attack headers = { 'X-RateLimit-Limit' => match_data[:limit].to_s, 'X-RateLimit-Remaining' => '0', - 'X-RateLimit-Reset' => (now + (match_data[:period] - now.to_i % match_data[:period])).to_s + 'X-RateLimit-Reset' => (now + (match_data[:period] - now.to_i % match_data[:period])).iso8601(6) } [429, headers, [{ error: 'Throttled' }.to_json]] diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb new file mode 100644 index 000000000..8b7311e39 --- /dev/null +++ b/config/initializers/timeout.rb @@ -0,0 +1 @@ +Rack::Timeout.timeout = 30 \ No newline at end of file |