fly.io-rails 0.1.5-x64-mingw32 → 0.1.7-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad650a53efae44837f6d54f24f341968915c66660541d72941e0b607575f5d76
-  data.tar.gz: ee7c705c18cd82d9b8de8e39f07799a769f75b16b4cfe489e94e7ed4f6539dd0
+  metadata.gz: bc0b775a726798289a06394e2546829c23ce1397acf218cc282f105d1245d30c
+  data.tar.gz: 53d4ebb3cf5bb1b2d4bcd841274d9a4f6ad86dd360ee861a522aae2fffc2bb3d
 SHA512:
-  metadata.gz: a345491d66b97c299536aa8b78fa5d23e1cd84687aa63ea29580dc2140cfcd375bb0f9c7f53fc34c8e97c295dfd15ad0252f3ad974d1a5da4e0f09bcd230d9e1
-  data.tar.gz: 711e2e6b2e5a8cf1fec03ffd8b89208f13dbd391106b6838b8980c52761724b4814912fc455b09165e4810aee912c1023512d157a28516bfc8aa23261f5cf860
+  metadata.gz: f3a74146ab620b21a55038794797fa7ff30f5f82ed0743071b92ad86fb90de50fb6edf9886eac36e6228303b3d42bbc11a816dc18a7dcc9348d4d828f117fb93
+  data.tar.gz: 1875baf3fd402131df5194b39743095174250338f42c978794aa34ffd711b8296556435597b2e6c6b6b552523fa748a5d292d2c74a1e558c02cb7a3e327dc317

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.5'
+  VERSION = '0.1.7'
 end

data/lib/fly.io-rails.rb

@@ -11,7 +11,7 @@ class FlyIoRailtie < Rails::Railtie
   end
 
   # set FLY_IMAGE_NAME on Nomad VMs
-  if not ENV['FLY_IMAGE_NAME'] and ENV['FLY_APP_NAME'] and ENV['FLY_API_TOKEN']
+  if not ENV['FLY_IMAGE_REF'] and ENV['FLY_APP_NAME'] and ENV['FLY_API_TOKEN']
     require 'fly.io-rails/machines'
 
     ENV['FLY_IMAGE_REF'] = Fly::Machines.graphql(%{

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.5
+  version: 0.1.7
 platform: x64-mingw32
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-02 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -69,8 +69,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