shared-infrastructure 0.0.4 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac6f2b797902cb75d59273db4e59a09801925ad3
-  data.tar.gz: 2225a1a5ad142f4a34fb75931f7dc86c64dcde2e
+  metadata.gz: acbb88aca695caae7288c8b87d27a922f32db19b
+  data.tar.gz: 4452c8a7ebaaef449cdefae36b70bd3369cef97f
 SHA512:
-  metadata.gz: b5f3c49119662abed44d2caa374be45d57250c936b83b65015cdd71fc3e904d65f5d7b6391ce687a64fb653f630b3cf0334351e8e1d6b8bffdefd6f8a279bfb1
-  data.tar.gz: 7ecea13f4f49d5e1446ec6862e02cf17bf05d1e6a01a961e3aaf1f563a6af97f0bde66011e74566dcb11823d3eb30583768c8c89c43c164b2f46cbb2ca7cb80e
+  metadata.gz: 934e545b36a97a2e1d1385e2bc49edbf913486abb3f311b14c5328c10d205c4bc3015ad092ee39c3d456a4471825f81858080781401a370b5b624acbd708e7ff
+  data.tar.gz: de793ba382532a0f9d264416fcd465824b9d2f911071822129cce780ba6a4760667bc799accc1b23a62dcdff0cfa162e2ee65f4d095706265c5c5a4adcedccb0

data/bin/create-rails-app

@@ -4,4 +4,7 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require "shared_infrastructure"
 
-Runner::Rails.new.main.save
+begin Runner::Rails.new.main.save
+rescue Runner::MissingArgument => e
+  e.opts.abort e.to_s + "\n" + e.opts.to_s
+end

data/bin/create-reverse-proxy

@@ -4,4 +4,7 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require "shared_infrastructure"
 
-Runner::ReverseProxy.new.main.save
+begin Runner::ReverseProxy.new.main.save
+rescue Runner::MissingArgument => e
+  e.opts.abort e.to_s + "\n" + e.opts.to_s
+end

data/bin/create-server-block

@@ -4,4 +4,7 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require "shared_infrastructure"
 
-Runner::StaticSite.new.main.save
+begin Runner::StaticSite.new.main.save
+rescue Runner::MissingArgument => e
+  e.opts.abort e.to_s + "\n" + e.opts.to_s
+end

data/lib/shared_infrastructure.rb

@@ -12,5 +12,6 @@ require "shared_infrastructure/nginx/builder.rb"
 require "shared_infrastructure/runner/base.rb"
 require "shared_infrastructure/runner/reverse_proxy.rb"
 require "shared_infrastructure/runner/static_site.rb"
+require "shared_infrastructure/runner/rails.rb"
 require "shared_infrastructure/systemd/systemd.rb"
 require "shared_infrastructure/systemd/rails.rb"

data/lib/shared_infrastructure/nginx/builder.rb

@@ -39,9 +39,11 @@ Finally, re-run this script to configure nginx for TLS.
       end
 
       def save
+        puts "writing server block: #{Nginx.server_block_location(domain_name)}" if Runner.debug
         File.open(Nginx.server_block_location(domain_name), "w") do |f|
           f << to_s
         end
+        puts "enabling site" if Runner.debug
         `ln -fs ../sites-available/#{domain_name} #{Nginx.enabled_server_block_location(domain_name)}`
       end
 
@@ -153,7 +155,7 @@ Finally, re-run this script to configure nginx for TLS.
     end
 
     class RailsHttp < Site
-      def initialize(domain_name, user, _certificate_domain = nil)
+      def initialize(domain_name, user, _certificate_domain = nil, accel_location: nil)
         super(domain_name,
           user,
             Nginx::RailsServerBlock.new(
@@ -162,8 +164,9 @@ Finally, re-run this script to configure nginx for TLS.
               listen: Nginx::ListenHttp.new,
               location: [
                 Nginx::RailsLocation.new(domain_name),
+                accel_location ? Nginx::AccelLocation.new(accel_location) : nil,
                 Nginx::ActionCableLocation.new(domain_name)
-              ]
+              ].compact
             )
           )
       end
@@ -176,7 +179,7 @@ Finally, re-run this script to configure nginx for TLS.
     class RailsHttps < Site
       include Https
 
-      def initialize(domain_name, user, _certificate_domain = nil)
+      def initialize(domain_name, user, certificate_domain = nil, accel_location: nil)
         @certificate_domain = certificate_domain || domain_name
         super(domain_name,
           user,
@@ -186,8 +189,9 @@ Finally, re-run this script to configure nginx for TLS.
             listen: Nginx::ListenHttps.new(domain_name, certificate_domain),
             location: [
               Nginx::RailsLocation.new(domain_name),
+              accel_location ? Nginx::AccelLocation.new(accel_location) : nil,
               Nginx::ActionCableLocation.new(domain_name)
-            ]
+            ].compact
           ),
           Nginx::TlsRedirectServerBlock.new(domain_name)
         )

data/lib/shared_infrastructure/nginx/location.rb

@@ -17,6 +17,22 @@ module Nginx
     attr_reader :location
   end
 
+  class AccelLocation < Location
+    def initialize(location, root = "/")
+      super(location)
+      @root = root
+    end
+
+    def to_s(level = 0)
+      Lines.new("location /#{location.chomp("/").reverse.chomp("/").reverse}/ {",
+        "  internal;",
+        "  root #{root};",
+        "}").format(level)
+    end
+
+    attr_reader :location, :root
+  end
+
   class AcmeLocation < Location
     def initialize(certificate_domain, location = "/.well-known")
       super(location)
@@ -84,6 +100,10 @@ module Nginx
       @proxy_url = proxy_url
     end
 
+    ##
+    # Don't change any of the response headers
+    # http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_redirect
+    # The URI is added if none is specified in the proxy_url.
     def to_s(level = 0)
       Lines.new("location #{location} {",
         "  proxy_pass #{proxy_url};",

data/lib/shared_infrastructure/nginx/server.rb

@@ -42,7 +42,7 @@ module Nginx
           "# http://stackoverflow.com/a/11313241/3109926 said the following",
           "# is what serves from public directly without hitting Puma",
           "root #{root_directory};",
-          "try_files $uri/index.html $uri @example.com;",
+          "try_files $uri/index.html $uri @#{domain_name};",
           "error_page 500 502 503 504 /500.html;",
           "client_max_body_size 4G;",
           "keepalive_timeout 10;"

data/lib/shared_infrastructure/nginx/server_block.rb

@@ -11,13 +11,6 @@ module Nginx
       @upstream = upstream
     end
 
-    def save
-      File.open(Nginx.server_block_location(server.domain_name), "w") do |f|
-        f << to_s
-      end
-      `ln -fs ../sites-available/#{server.domain_name} #{Nginx.enabled_server_block_location(server.domain_name)}`
-    end
-
     def to_s
       [
         upstream_string,

data/lib/shared_infrastructure/runner/base.rb

@@ -3,19 +3,23 @@
 require "optparse"
 
 module Runner
+  @debug = false
+  class << self
+    attr_accessor :debug
+  end
+
   ##
   # Basic runner for nginx config file generation.
   class Base
     def main
       options = process_options
-      options.merge!(process_args)
 
-      puts "options: #{options.inspect}" if options[:debug]
+      puts "options: #{options.inspect}" if Runner.debug
 
       Nginx.prepare_fake_files(options[:domain_name], options[:certificate_domain]) if Nginx.root?
 
       @builder_class = protocol_factory(options)
-      puts "builder_class: #{builder_class.inspect}" if options[:debug]
+      puts "builder_class: #{builder_class.inspect}" if Runner.debug
       builder_class
     end
 
@@ -23,43 +27,46 @@ module Runner
       options.select { |k, _v| k == :user }
     end
 
-    def process_args
-      $stderr.puts "domain required" unless ARGV.size == 1
+    def process_args(opts = nil)
+      raise MissingArgument.new("domain required", opts) unless ARGV.size == 1
       { domain_name: ARGV[0] }
     end
 
     def process_options(http_builder_class = Nginx::Builder::SiteHttp,
       https_builder_class = Nginx::Builder::SiteHttps)
       options = {}
-      OptionParser.new do |opts|
+      opts = OptionParser.new do |opts|
         opts.banner = "Usage: [options]"
 
+        # FIXME: This is only applicable to Rails apps.
+        opts.on("-a LOCATION",
+          "--accel LOCATION",
+          "Location to serve when app responds with 'X-Accel'") do |accel_location|
+          options[:accel_location] = accel_location
+          puts "FOUND X-ACCEL"
+        end
+
         opts.on("-c DOMAIN",
           "--certificate-domain DOMAIN",
           "Use the certificate for DOMAIN.") do |certificate_domain|
           options[:certificate_domain] = certificate_domain
         end
 
-        opts.on("-h", "--help", "Prints this help") do
-          puts opts
-          exit
-        end
-
         opts.on("-d", "--debug", "Print debugging information.") do
           options[:debug] = true
+          Runner.debug = true
         end
 
-        opts.on("-p PROTOCOL",
+        opts.on("-P PROTOCOL",
           "--protocol PROTOCOL",
           "HTTP|HTTPS. Default: HTTPS if key files exist, else HTTP.") do |protocol|
-          options[:protocol] = case protocol
+          options[:protocol] = case protocol.upcase
                                when "HTTP"
                                  http_builder_class
                                when "HTTPS"
                                  https_builder_class
                                else
-                                 puts opts
-                                 exit
+                                 opts.abort opts.help
                                end
         end
 
@@ -80,9 +87,10 @@ module Runner
           Nginx.dhparam = keysize
         end
 
-        yield opts if block_given?
-      end.parse!
-      options
+        options.merge! yield opts if block_given?
+      end
+      opts.parse!
+      options.merge!(process_args(opts))
     end
 
     attr_reader :builder_class
@@ -107,4 +115,13 @@ module Runner
       end
     end
   end
+
+  class MissingArgument < RuntimeError
+    def initialize(msg, opts)
+      @opts = opts
+      super msg
+    end
+    attr_reader :msg
+    attr_reader :opts
+  end
 end

data/lib/shared_infrastructure/runner/rails.rb

@@ -0,0 +1,31 @@
+module Runner
+  class Rails < Base
+    def main
+      builder = super
+      FileUtils.mkdir_p(File.dirname(Systemd.unit_file("example.com"))) if Nginx.root?
+      builder
+    end
+
+    def process_options
+      super(Nginx::Builder::RailsHttp, Nginx::Builder::RailsHttps)
+    end
+
+    def protocol_factory(options)
+      protocol_class = super(
+        options,
+        Nginx::Builder::RailsHttp,
+        Nginx::Builder::RailsHttps
+      )
+
+      # puts "Runner::Rails protocol_class: #{protocol_class}"
+      # TODO: Each class has a subtly different group of lines here.
+      # There's almost certainly a refactoring that would make this less
+      # convoluted.
+      domain_name = options.delete(:domain_name)
+      user = options.delete(:user) || "ubuntu"
+      certificate_domain = options.delete(:certificate_domain)
+      accel_location = options.delete(:accel_location)
+      protocol_class.new(domain_name, user, certificate_domain, accel_location: accel_location)
+    end
+  end
+end

data/lib/shared_infrastructure/runner/reverse_proxy.rb

@@ -8,8 +8,8 @@ module Runner
       super(options).merge(proxy_url: ARGV[1])
     end
 
-    def process_args
-      $stderr.puts "domain and target url required" unless ARGV.size == 2
+    def process_args(opts = nil)
+      raise MissingArgument.new("domain and target url required", opts) unless ARGV.size == 2
       {
         domain_name: ARGV[0],
         proxy_url: ARGV[1]

data/lib/shared_infrastructure/systemd/rails.rb

@@ -19,6 +19,8 @@ module Systemd
           raise "Missing environment variable"
         end
 
+        puts "writing unit file (domain_name): #{Systemd.unit_file(domain_name)} (#{domain_name})" if Runner.debug
+
         result = File.open(Systemd.unit_file(domain_name), "w") do |f|
           f << <<~UNIT_FILE
             [Unit]
@@ -62,8 +64,10 @@ module Systemd
           UNIT_FILE
         end
 
+        puts "changing mode of unit file" if Runner.debug
         FileUtils.chmod(0o600, Systemd.unit_file(domain_name))
-        `systemctl enable $domain_name.service` if Process.uid.zero?
+        puts "enabling service" if Runner.debug && Process.uid.zero?
+        `systemctl enable #{domain_name}.service` if Process.uid.zero?
 
         result
       end

data/lib/shared_infrastructure/systemd/systemd.rb

@@ -1,7 +1,7 @@
 module Systemd
   class Configuration
     def initialize
-      @unit_file_path = File.join(Nginx.root, "/lib/systemd/system")
+      @unit_file_path = "#{Nginx.root}/lib/systemd/system"
     end
 
     def unit_file(domain_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shared-infrastructure
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.13
 platform: ruby
 authors:
 - Larry Reid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies: []
 description: 'For static sites, Rails apps, and reverse proxies.
 
@@ -35,6 +35,7 @@ files:
 - lib/shared_infrastructure/nginx/site.rb
 - lib/shared_infrastructure/nginx/upstream.rb
 - lib/shared_infrastructure/runner/base.rb
+- lib/shared_infrastructure/runner/rails.rb
 - lib/shared_infrastructure/runner/reverse_proxy.rb
 - lib/shared_infrastructure/runner/static_site.rb
 - lib/shared_infrastructure/systemd/rails.rb
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Configure nginx, systemd, and/or Puma