updates
This commit is contained in:
+2
-1
@@ -1,7 +1,8 @@
|
||||
development:
|
||||
validation_framework: :active_model #optional
|
||||
#database: "http://mozo:secret@localhost:5984/qwaiter_development"
|
||||
database: mozo_development
|
||||
database: "http://admin:development@localhost:5984/mozo_development"
|
||||
#database: mozo_development
|
||||
test:
|
||||
validation_framework: :active_model #optional
|
||||
#database: "http://mozo:secret@localhost:5984/qwaiter_test"
|
||||
|
||||
@@ -24,14 +24,16 @@ Qwaiter::Application.configure do
|
||||
|
||||
#config.ember.variant = :development
|
||||
|
||||
config.action_controller.asset_host = "https://assets.mozo.local"
|
||||
config.action_controller.asset_host = "https://localhost:3002"
|
||||
config.force_ssl = true
|
||||
|
||||
# config.web_console.automount = true
|
||||
|
||||
# Don't care if the mailer can't send
|
||||
config.action_mailer.raise_delivery_errors = false
|
||||
config.action_mailer.delivery_method = :letter_opener
|
||||
config.action_mailer.default_url_options = { host: 'https://www.mozo.local', port: 80 }
|
||||
config.action_controller.default_url_options = { host: 'https://www.mozo.local', port: 80 }
|
||||
config.action_mailer.default_url_options = { host: 'https://localhost', port: 3002 }
|
||||
config.action_controller.default_url_options = { host: 'https://localhost', port: 3002 }
|
||||
|
||||
# Print deprecation notices to the Rails logger
|
||||
config.active_support.deprecation = :log
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
# Puma can serve each request in a thread from an internal thread pool.
|
||||
# The `threads` method setting takes two numbers: a minimum and maximum.
|
||||
# Any libraries that use thread pools should be configured to match
|
||||
# the maximum value specified for Puma. Default is set to 5 threads for minimum
|
||||
# and maximum; this matches the default thread size of Active Record.
|
||||
#
|
||||
max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
|
||||
min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
|
||||
threads min_threads_count, max_threads_count
|
||||
|
||||
# Specifies the `worker_timeout` threshold that Puma will use to wait before
|
||||
# terminating a worker in development environments.
|
||||
#
|
||||
worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
|
||||
|
||||
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
|
||||
#
|
||||
port ENV.fetch("PORT") { 3001 }
|
||||
|
||||
# Specifies the `environment` that Puma will run in.
|
||||
#
|
||||
environment ENV.fetch("RAILS_ENV") { "development" }
|
||||
|
||||
if ENV['RAILS_ENV'] == 'development'
|
||||
localhost_key = "#{File.join('config', 'certs-local', 'localhost-key.pem')}"
|
||||
localhost_crt = "#{File.join('config', 'certs-local', 'localhost.pem')}"
|
||||
# To be able to use rake etc
|
||||
ssl_bind '0.0.0.0', 3002, {
|
||||
key: localhost_key,
|
||||
cert: localhost_crt,
|
||||
verify_mode: 'none'
|
||||
}
|
||||
end
|
||||
|
||||
# Specifies the `pidfile` that Puma will use.
|
||||
pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
|
||||
|
||||
# Specifies the number of `workers` to boot in clustered mode.
|
||||
# Workers are forked web server processes. If using threads and workers together
|
||||
# the concurrency of the application would be max `threads` * `workers`.
|
||||
# Workers do not work on JRuby or Windows (both of which do not support
|
||||
# processes).
|
||||
#
|
||||
workers ENV.fetch("WEB_CONCURRENCY") { 2 }
|
||||
|
||||
# Use the `preload_app!` method when specifying a `workers` number.
|
||||
# This directive tells Puma to first boot the application and load code
|
||||
# before forking the application. This takes advantage of Copy On Write
|
||||
# process behavior so workers use less memory.
|
||||
#
|
||||
# preload_app!
|
||||
|
||||
# Allow puma to be restarted by `rails restart` command.
|
||||
plugin :tmp_restart
|
||||
Reference in New Issue
Block a user