fly.io-rails 0.1.6-arm64-darwin → 0.1.7-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57c19a783b242ccbae7b34bdb3a69161c48759c079d1867d8f75032cf9a4c3d
-  data.tar.gz: dc815fea963874bdf8a55f92a2072f7aebc16e1e73ca483361fe5c7103421739
+  metadata.gz: 6f4de14d57e56fad6d076f44b1d0c8a440245731b058791515cd6d3e2359c108
+  data.tar.gz: 04abcef92d28b11a9a026f67ac35702af66aab8a72014d177ca9ddb52d9d87ba
 SHA512:
-  metadata.gz: 5d19e20ecd0e94c0411674fe500c3e174b30804b14aba3f4c56f99b87a83a1c6c6ba2d53e712e4a0ae5c7c962556cf9bf08bbf3a90acd5576702d53bd5fb4d63
-  data.tar.gz: 2b11fde476cf6c021822b83a65946823030f26c9939a5f61773bfc38bc22b07163f5c744b6ce2257b154fb6333009b3b6c0c7b5748649cfae6c3102d1250657f
+  metadata.gz: 37f1c09b5ad7d4413b2ecf6bf60db2ac07d13f1b6ab5f41d9f6360c9c167a8fbb1da654c2ad241582707ee323eed06bf4fcb63f58e618489719e81deaf802db5
+  data.tar.gz: c79d2b471049eac643e97f2a99461f839a78331544d3b786208c551cd15e87f50f5f7e72ce991f753e665ef08e87cba62bb9e7218559e11c3b222fa22d8d203b

data/lib/fly.io-rails/actions.rb

@@ -26,8 +26,10 @@ module Fly
       regions = options[:region]&.flatten || []
       @litefs = options[:litefs]
       @nomad = options[:nomad]
+      @passenger = options[:passenger]
+      @serverless = options[:serverless]
 
-      # prepare template variablesl
+      # prepare template variables
       @ruby_version = RUBY_VERSION
       @bundler_version = Bundler::VERSION
       @node = File.exist? 'node_modules'
@@ -56,6 +58,11 @@ module Fly
 
       # set additional variables based on application source
       scan_rails_app
+
+      # determine processes
+      @procs = {web: 'bin/rails server'}
+      @procs[:web] = "nginx -g 'daemon off;'" if @passenger
+      @procs[:worker] = 'bundle exec sidekiq' if @sidekiq
     end
 
     def app
@@ -91,6 +98,16 @@ module Fly
       app_template 'dockerignore.erb', '.dockerignore'
     end
 
+    def generate_nginx_conf
+      return unless @passenger
+      app_template 'nginx.conf.erb', 'config/nginx.conf'
+
+      if @serverless
+        app_template 'hook_detached_process.erb', 'config/hook_detached_process'
+        FileUtils.chmod 'u+x', 'config/hook_detached_process'
+      end
+    end
+
     def generate_terraform
       app_template 'main.tf.erb', 'main.tf'
     end
@@ -100,7 +117,7 @@ module Fly
     end
 
     def generate_procfile
-      return unless @sidekiq
+      return unless @procs.length > 1
       app_template 'Procfile.fly.erb', 'Procfile.fly'
     end
 

data/lib/fly.io-rails/dsl.rb

@@ -2,26 +2,26 @@ module Fly
   module DSL
     class Base
       def initialize
-	@value = {}
+        @value = {}
       end
 
       def self.option name, default=nil
-	@options ||= {}
-	@options[name] = default
-
-	define_method name do |*args|
-	  if args.length == 1
-	    @value[name] =  args.first
-	  elsif args.length > 1
-	    raise ArgumentError.new("wrong number of arguments (given #{args.length}, expected 0..1)")
-	  end
-
-	  @value.include?(name) ? @value[name] : default
-	end
+        @options ||= {}
+        @options[name] = default
+
+        define_method name do |*args|
+          if args.length == 1
+            @value[name] =  args.first
+          elsif args.length > 1
+            raise ArgumentError.new("wrong number of arguments (given #{args.length}, expected 0..1)")
+          end
+
+          @value.include?(name) ? @value[name] : default
+        end
       end
 
       def self.options
-	@options ||= {}
+        @options ||= {}
       end
     end
 
@@ -53,21 +53,21 @@ module Fly
       @@blocks = {}
 
       def initialize
-	@config = {}
+        @config = {}
       end
 
       def self.block name, kind
-	@@blocks[name] = kind
+        @@blocks[name] = kind
 
-	define_method name do |&block| 
-	  @config[name] ||= kind.new
-	  @config[name].instance_eval(&block) if block
-	  @config[name]
-	end
+        define_method name do |&block| 
+          @config[name] ||= kind.new
+          @config[name].instance_eval(&block) if block
+          @config[name]
+        end
       end
 
       def self.blocks
-	@@blocks
+        @@blocks
       end
 
       block :machine, Machine

data/lib/fly.io-rails/scanner.rb

@@ -14,8 +14,10 @@ module Fly
 
       @sidekiq = IO.read('Gemfile').include? 'sidekiq' rescue false
 
+      @cable = ! Dir['app/channels/*.rb'].empty?
+
       if (YAML.load_file('config/cable.yml').dig('production', 'adapter') rescue false)
-        @redis_cable = true
+        @redis_cable = @cable
       end
 
       if (IO.read('config/environments/production.rb') =~ /redis/i rescue false)

data/lib/fly.io-rails/version.rb

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/generators/fly/app_generator.rb

@@ -10,6 +10,8 @@ class AppGenerator < Rails::Generators::Base
   class_option :nomad, type: :boolean, default: false
 
   class_option :litefs, type: :boolean, default: false
+  class_option :passenger, type: :boolean, default: false
+  class_option :serverless, type: :boolean, default: false
 
   def generate_app
     source_paths.push File.expand_path('../templates', __dir__)
@@ -22,6 +24,7 @@ class AppGenerator < Rails::Generators::Base
     action.generate_fly_config unless File.exist? 'config/fly.rb'
     action.generate_dockerfile unless File.exist? 'Dockerfile'
     action.generate_dockerignore unless File.exist? '.dockerignore'
+    action.generate_nginx_conf unless File.exist? 'config/nginx.conf'
     action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
     action.generate_procfile unless File.exist? 'Procfile.rake'
     action.generate_litefs if options[:litefs] and not File.exist? 'config/litefs'

data/lib/generators/templates/Dockerfile.erb

@@ -81,7 +81,7 @@ RUN gem update --system --no-document && \
 
 COPY Gemfile* ./
 RUN bundle install &&  rm -rf vendor/bundle/ruby/*/cache
-<% if @sidekiq -%>
+<% if @procs.length > 1 -%>
 RUN gem install foreman
 <% end -%>
 
@@ -115,6 +115,7 @@ FROM base
 
 <%
   @deploy_packages = %w(file vim curl gzip)
+  @deploy_packages += %w(nginx passenger libnginx-mod-http-passenger) if @passenger
   @deploy_packages << 'postgresql-client' if @postgresql
   @deploy_packages << 'libsqlite3-0' if @sqlite3
   @deploy_packages << 'fuse' if @litefs
@@ -122,6 +123,13 @@ FROM base
 ARG DEPLOY_PACKAGES=<%= @deploy_packages.join(' ').inspect %>
 ENV DEPLOY_PACKAGES=${DEPLOY_PACKAGES}
 
+<% if @passenger -%>
+RUN apt-get install -y dirmngr gnupg apt-transport-https ca-certificates curl && \
+  curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | \
+    gpg --dearmor > /etc/apt/trusted.gpg.d/phusion.gpg && \
+  sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger bullseye main > /etc/apt/sources.list.d/passenger.list'
+
+<% end -%>
 RUN --mount=type=cache,id=prod-apt-cache,sharing=locked,target=/var/cache/apt \
     --mount=type=cache,id=prod-apt-lib,sharing=locked,target=/var/lib/apt \
     apt-get update -qq && \
@@ -150,6 +158,16 @@ ADD config/litefs.yml /etc/litefs.yml
 RUN mkdir /data
 <% end -%>
 #######################################################################
+<% if @passenger -%>
+
+# configure nginx/passenger
+COPY config/nginx.conf /etc/nginx/sites-available/rails.conf
+RUN rm /etc/nginx/sites-enabled/default && \
+    ln -s /etc/nginx/sites-available/rails.conf /etc/nginx/sites-enabled/
+<% if @serverless -%>
+COPY config/hook_detached_process /etc/nginx/
+<% end -%> 
+<% end -%>
 
 # Deploy your application
 COPY . .

data/lib/generators/templates/Procfile.fly.erb

@@ -1,4 +1,3 @@
-web: bin/rails server
-<% if @sidekiq -%>
-worker: bundle exec sidekiq
+<% @procs.each do |type, command| -%>
+<%= type %>: <%= command %>
 <% end -%>

data/lib/generators/templates/fly.rake.erb

@@ -28,12 +28,12 @@ namespace :fly do
   <%- else -%>
   task :server => :swapfile do
   <%- end -%>
-  <%- if @sidekiq -%>
+  <%- if @procs.length > 1 -%>
     Bundler.with_original_env do
       sh 'foreman start --procfile=Procfile.fly'
     end
   <%- else -%>
-    sh 'bin/rails server'
+    sh <%= @procs.values.first.inspect %>
   <%- end -%>
   end
 

data/lib/generators/templates/fly.toml.erb

@@ -25,8 +25,8 @@ processes = []
 <% end -%>
 
 [mounts]
-source = <%= "#{app.gsub('-', '_')}_volume".inspect %>
-destination = "/mnt/volume"
+  source = <%= "#{app.gsub('-', '_')}_volume".inspect %>
+  destination = "/mnt/volume"
 <% end -%>
 
 [experimental]
@@ -43,8 +43,13 @@ destination = "/mnt/volume"
   protocol = "tcp"
   script_checks = []
   [services.concurrency]
+<% if @cable -%>
+    hard_limit = 2500
+    soft_limit = 2000
+<% else -%>
     hard_limit = 25
     soft_limit = 20
+<% end -%>
     type = "connections"
 
   [[services.ports]]

data/lib/generators/templates/hook_detached_process.erb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+status = `passenger-status`
+
+processes = status[/^Processes\s*:\s*(\d*)/, 1].to_i
+<% if @cable -%>
+cable = status[/^<%= @app %>-cable.*?\n\n/m]
+processes -= 1 if cable and cable =~ /Sessions:\s*[1-9]/
+<% end -%>
+
+system 'nginx -s stop' if processes == 0

data/lib/generators/templates/nginx.conf.erb

@@ -0,0 +1,29 @@
+<% if @serverless -%>
+passenger_ctl hook_detached_process /etc/nginx/hook_detached_process;
+passenger_min_instances 0;
+passenger_pool_idle_time 300;
+
+<% end -%>
+server {
+    listen 8080;
+    server_name <%= @app %>.fly.dev;
+    root /app/public;
+
+    passenger_enabled on;
+    passenger_ruby /usr/lib/fullstaq-ruby/versions/<%= @ruby_version %>-jemalloc/bin/ruby;
+
+<% if @cable -%>
+location / {
+  passenger_app_group_name <%= @app%>;
+}
+
+location /cable {
+  passenger_app_group_name <%= @app%>-cable;
+  passenger_force_max_concurrent_requests_per_process 0;
+}
+
+<% end -%>
+    # Nginx has a default limit of 1 MB for request bodies, which also applies
+    # to file uploads. The following line enables uploads of up to 50 MB:
+    client_max_body_size 50M;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: arm64-darwin
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -68,8 +68,10 @@ files:
 - lib/generators/templates/fly.rake.erb
 - lib/generators/templates/fly.rb.erb
 - lib/generators/templates/fly.toml.erb
+- lib/generators/templates/hook_detached_process.erb
 - lib/generators/templates/litefs.yml.erb
 - lib/generators/templates/main.tf.erb
+- lib/generators/templates/nginx.conf.erb
 - lib/generators/templates/patches/action_cable.rb
 - lib/tasks/fly.rake
 homepage: https://github.com/rubys/fly-io.rails