diff --git a/Gemfile b/Gemfile index cb2ef8986..458c7ca24 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ gem 'puma-metrics' gem 'puma_worker_killer' gem "rack-timeout", require: "rack/timeout/base" -group :production, :staging do +group :production do gem 'unicorn', :platforms => :ruby gem 'capistrano3-unicorn' end diff --git a/config/deploy.rb b/config/deploy.rb index 3faafffcc..129ad66f8 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -7,8 +7,8 @@ # @see lib/capistrano/tasks # @see https://capistranorb.com -set :stages, %w(production development staging) -set :default_stage, "staging" +set :stages, %w(production test) +set :default_stage, "test" set :application, "danbooru" set :repo_url, "git://github.com/danbooru/danbooru.git" set :deploy_to, "/var/www/danbooru2" diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb deleted file mode 100644 index 87527985c..000000000 --- a/config/deploy/staging.rb +++ /dev/null @@ -1,6 +0,0 @@ -set :user, "danbooru" -set :rails_env, "staging" -server "testbooru.donmai.us", :roles => %w(web app db), :primary => true, :user => "danbooru" - -set :linked_files, fetch(:linked_files, []).push(".env.staging") -set :deploy_to, "/var/www/danbooru2" diff --git a/config/environments/staging.rb b/config/environments/staging.rb deleted file mode 100644 index 1b2f2653b..000000000 --- a/config/environments/staging.rb +++ /dev/null @@ -1,81 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Enable Rack::Cache to put a simple HTTP cache in front of your application - # Add `rack-cache` to your Gemfile before enabling this. - # For large-scale production use, consider using a caching reverse proxy like - # NGINX, varnish or squid. - # config.action_dispatch.rack_cache = true - - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. - config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present? - - # Compress JavaScripts and CSS. - # config.assets.js_compressor = :uglifier - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - # config.assets.compile = true - - # Asset digests allow you to set far-future HTTP expiration dates on all assets, - # yet still be able to expire them through the digest params. - # config.assets.digest = true - - # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Use the lowest log level to ensure availability of diagnostic information - # when problems arise. - config.log_level = :error - - # Prepend all log lines with the following tags. - # config.log_tags = [ :subdomain, :uuid ] - - # Use a different logger for distributed setups. - # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - - # Ignore bad email addresses and do not raise email delivery errors. - # Set this to true and configure the email server for immediate delivery to raise delivery errors. - # config.action_mailer.raise_delivery_errors = false - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = [I18n.default_locale] - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false - - config.eager_load = true -end diff --git a/config/unicorn/staging.rb b/config/unicorn/staging.rb deleted file mode 100644 index 7164d159d..000000000 --- a/config/unicorn/staging.rb +++ /dev/null @@ -1,47 +0,0 @@ -# Set your full path to application. -app_path = "/var/www/danbooru2/current" - -# Set unicorn options -worker_processes 2 - -preload_app true -timeout 180 -listen "/tmp/.unicorn.sock", :backlog => 512 - -# Spawn unicorn master worker for user apps (group: apps) -user 'danbooru', 'danbooru' - -# Fill path to your app -working_directory app_path - -# Should be 'production' by default, otherwise use other env -rails_env = ENV['RAILS_ENV'] || 'staging' - -# Log everything to one file -stderr_path "log/unicorn.log" -stdout_path "log/unicorn.log" - -# Set master PID location -pid "#{app_path}/tmp/pids/unicorn.pid" - -before_fork do |server, worker| - old_pid = "#{server.config[:pid]}.oldbin" - - if File.exist?(old_pid) && server.pid != old_pid - begin - Process.kill("QUIT", File.read(old_pid).to_i) - rescue Errno::ENOENT, Errno::ESRCH - # someone else did our job for us - end - end - - if defined?(ActiveRecord::Base) - ActiveRecord::Base.connection.disconnect! - end -end - -after_fork do |server, worker| - if defined?(ActiveRecord::Base) - ActiveRecord::Base.establish_connection - end -end