First bit of config done

2026-04-23 10:59:24 +00:00
parent 5991fd1296
commit d963716372
4 changed files with 134 additions and 40 deletions
--- a/2
+++ b/2
@@ -41,7 +41,7 @@ gem "image_processing", "~> 1.2"
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 # gem "image_processing", "~> 1.2"

-ggroup :development, :test do
+group :development, :test do
  # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
  gem "debug", platforms: %i[ mri windows ], require: "debug/prelude"

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,13 +77,19 @@ GEM
      uri (>= 0.13.1)
    addressable (2.9.0)
      public_suffix (>= 2.0.2, < 8.0)
+    ast (2.4.3)
    base64 (0.2.0)
    bcrypt (3.1.20)
    bigdecimal (3.1.8)
    bindex (0.8.1)
    bootsnap (1.18.3)
      msgpack (~> 1.2)
+    brakeman (8.0.4)
+      racc
    builder (3.2.4)
+    bundler-audit (0.9.3)
+      bundler (>= 1.2.0)
+      thor (~> 1.0)
    capybara (3.40.0)
      addressable
      matrix
@@ -114,10 +120,19 @@ GEM
      rotp (~> 6.0)
    drb (2.2.1)
    erubi (1.12.0)
+    et-orbi (1.4.0)
+      tzinfo
+    ffi (1.17.4)
+    fugit (1.12.1)
+      et-orbi (~> 1.4)
+      raabro (~> 1.4)
    globalid (1.2.1)
      activesupport (>= 6.1)
    i18n (1.14.5)
      concurrent-ruby (~> 1.0)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
+      ruby-vips (>= 2.0.17, < 3)
    importmap-rails (2.2.3)
      actionpack (>= 6.0.0)
      activesupport (>= 6.0.0)
@@ -130,6 +145,8 @@ GEM
      actionview (>= 7.0.0)
      activesupport (>= 7.0.0)
    json (2.19.4)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
    logger (1.7.0)
    loofah (2.25.1)
      crass (~> 1.0.2)
@@ -142,6 +159,8 @@ GEM
      net-smtp
    marcel (1.1.0)
    matrix (0.4.2)
+    mini_magick (5.3.1)
+      logger
    mini_mime (1.1.5)
    mini_portile2 (2.8.6)
    minitest (6.0.5)
@@ -164,12 +183,21 @@ GEM
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
    orm_adapter (0.5.0)
+    parallel (2.0.1)
+    parser (3.3.11.1)
+      ast (~> 2.4.1)
+      racc
    prism (1.9.0)
+    propshaft (1.3.2)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
    psych (5.1.2)
      stringio
    public_suffix (5.0.5)
    puma (6.6.1)
      nio4r (~> 2.0)
+    raabro (1.4.0)
    racc (1.7.3)
    rack (3.0.11)
    rack-session (2.0.0)
@@ -209,10 +237,11 @@ GEM
      thor (~> 1.0, >= 1.2.2)
      tsort (>= 0.2)
      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
    rake (13.2.1)
    rdoc (6.6.3.1)
      psych (>= 4.0.0)
-    regexp_parser (2.9.1)
+    regexp_parser (2.12.0)
    reline (0.5.7)
      io-console (~> 0.5)
    responders (3.1.1)
@@ -224,6 +253,38 @@ GEM
      chunky_png (~> 1.0)
      rqrcode_core (~> 1.0)
    rqrcode_core (1.2.0)
+    rubocop (1.86.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    rubocop-rails (2.34.3)
+      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
+      rack (>= 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rails-omakase (1.1.0)
+      rubocop (>= 1.72)
+      rubocop-performance (>= 1.24)
+      rubocop-rails (>= 2.30)
+    ruby-progressbar (1.13.0)
+    ruby-vips (2.3.0)
+      ffi (~> 1.12)
+      logger
    rubyzip (2.3.2)
    securerandom (0.4.1)
    selenium-webdriver (4.43.0)
@@ -232,6 +293,22 @@ GEM
      rexml (~> 3.2, >= 3.2.5)
      rubyzip (>= 1.2.2, < 4.0)
      websocket (~> 1.0)
+    solid_cable (3.0.12)
+      actioncable (>= 7.2)
+      activejob (>= 7.2)
+      activerecord (>= 7.2)
+      railties (>= 7.2)
+    solid_cache (1.0.10)
+      activejob (>= 7.2)
+      activerecord (>= 7.2)
+      railties (>= 7.2)
+    solid_queue (1.4.0)
+      activejob (>= 7.1)
+      activerecord (>= 7.1)
+      concurrent-ruby (>= 1.3.1)
+      fugit (~> 1.11)
+      railties (>= 7.1)
+      thor (>= 1.3.1)
    sprockets (4.2.2)
      concurrent-ruby (~> 1.0)
      logger
@@ -244,6 +321,7 @@ GEM
      railties (>= 6.0.0)
    stringio (3.1.0)
    thor (1.3.1)
+    thruster (0.1.20)
    timeout (0.6.1)
    tsort (0.2.0)
    turbo-rails (2.0.23)
@@ -251,6 +329,9 @@ GEM
      railties (>= 7.1.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
    uri (1.1.1)
    useragent (0.16.11)
    warden (1.2.9)
@@ -274,19 +355,28 @@ PLATFORMS

 DEPENDENCIES
  bootsnap
+  brakeman
+  bundler-audit
  capybara
  debug
  devise
  devise-two-factor
+  image_processing (~> 1.2)
  importmap-rails
  jbuilder
  mysql2 (~> 0.5)
+  propshaft
  puma (~> 6.0)
  rails (= 8.1.3)
  rqrcode
+  rubocop-rails-omakase
  selenium-webdriver
+  solid_cable
+  solid_cache
+  solid_queue
  sprockets-rails
  stimulus-rails
+  thruster
  turbo-rails
  tzinfo-data
  web-console
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,7 +9,8 @@ Bundler.require(*Rails.groups)
 module OpensmtpdRailsFrontend
  class Application < Rails::Application
    # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 8.1
+    config.autoload_lib(ignore: %w[assets tasks])

    # Configuration for the application, engines, and railties goes here.
    #
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,44 +1,47 @@
-# 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.
+
+#bind 'tcp://0.0.0.0:3002'
+
+# This configuration file will be evaluated by Puma. The top-level methods that
+# are invoked here are part of Puma's configuration DSL. For more information
+# about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html.
 #
-worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
+# Puma starts a configurable number of processes (workers) and each process
+# serves each request in a thread from an internal thread pool.
+#
+# You can control the number of workers using ENV["WEB_CONCURRENCY"]. You
+# should only set this value when you want to run 2 or more workers. The
+# default is already 1. You can set it to `auto` to automatically start a worker
+# for each available processor.
+#
+# The ideal number of threads per worker depends both on how much time the
+# application spends waiting for IO operations and on how much you wish to
+# prioritize throughput over latency.
+#
+# As a rule of thumb, increasing the number of threads will increase how much
+# traffic a given process can handle (throughput), but due to CRuby's
+# Global VM Lock (GVL) it has diminishing returns and will degrade the
+# response time (latency) of the application.
+#
+# The default is set to 3 threads as it's deemed a decent compromise between
+# throughput and latency for the average Rails application.
+#
+# Any libraries that use a connection pool or another resource pool should
+# be configured to provide at least as many connections as the number of
+# threads. This includes Active Record's `pool` parameter in `database.yml`.
+threads_count = ENV.fetch("RAILS_MAX_THREADS", 3)
+threads threads_count, threads_count

 # 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" }
-
-# 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!
+port ENV.fetch("PORT", 3000)

 # Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart
-bind 'tcp://0.0.0.0:3002'
+
+# Run the Solid Queue supervisor inside of Puma for single-server deployments.
+plugin :solid_queue if ENV["SOLID_QUEUE_IN_PUMA"]
+
+# Specify the PID file. Defaults to tmp/pids/server.pid in development.
+# In other environments, only set the PID file if requested.
+pidfile ENV["PIDFILE"] if ENV["PIDFILE"]
+