shared-infrastructure 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1421df4f78041aebbbaf255a6e676f8303b1c5844e96da104f3308893d3eb8a
-  data.tar.gz: d189b196f9f75dd554d6ee87418af780b1471486da956271c9c5de3a236cd07b
+  metadata.gz: 94062507bafc880f79be53ca05072f205c1ec7a503087ef3e58b7fc0516706d1
+  data.tar.gz: f6eba55e524a66bbddcf9c75a3eea9703a2baf9d38960c984f72e2a01e90b985
 SHA512:
-  metadata.gz: 2270b0180add1ef0781ccce7b6f37e9ff9e7c34673b8744c5592522d78b472e92d5796e4ca85c0412b34b5fa604e30fe151b40c521f96166295abf38f04a75c8
-  data.tar.gz: 72cc132a02f851a6f9840b91063e73aa1343df4463b49eac969022abf541c4005dc410e100e3868622f09d46df8d87c954d4d3b7926e1c059cab9fe329bd8be1
+  metadata.gz: b06abbc64c3d03b55bee2250700279d1d63d22b15bb8b9bc2ca6389d6d6de06d1f8395dced7ac60bd09507a89b5bea2fbb8ea0beb0b60a1367c88aff5a781e22
+  data.tar.gz: eb9605f6117fb9dd47882893bd140974e8f817caaf7dde8642749bba16aacdb33c4cd0a517b9e1c399cc0c727d602853640b1eb93c78b424f258a85dde29bc5a

data/lib/shared_infrastructure/domain.rb

@@ -7,19 +7,24 @@ module SharedInfrastructure
     end
 
     def certbot_domain_names
-      "#{domain_name} www.#{domain_name}"
+      domain_names.map { |domain| "#{domain} www.#{domain}" }.join(" ")
     end
 
     def certificate_directory
       "/etc/letsencrypt/live/#{domain_name}"
     end
 
+    def domain_name
+      domain_names.first
+    end
+
     def enabled_site
       "/etc/nginx/sites-enabled/#{domain_name}"
     end
 
-    def initialize(domain_name)
-      @domain_name = domain_name
+    def initialize(domain_names)
+      domain_names = [domain_names] unless domain_names.respond_to?(:map)
+      @domain_names = domain_names
     end
 
     def rails_env_log(rails_env = "production")
@@ -39,6 +44,6 @@ module SharedInfrastructure
       File.join(root, "html")
     end
 
-    attr_reader :domain_name
+    attr_reader :domain_names
   end
 end

data/lib/shared_infrastructure/nginx/builder.rb

@@ -9,7 +9,8 @@ module Nginx
       def save
         pem_file = "#{Nginx.certificate_directory(certificate_domain)}/dhparam.pem"
         FileUtils.mkdir_p File.dirname(pem_file)
-        `openssl dhparam #{Nginx.dhparam} -out #{pem_file}`
+        puts "openssl dhparam -out #{pem_file} #{Nginx.dhparam}" if Runner.debug
+        `openssl dhparam -out #{pem_file} #{Nginx.dhparam}`
         super
       end
     end
@@ -90,7 +91,7 @@ Finally, re-run this script to configure nginx for TLS.
           listen: Nginx::ListenHttps.new(domain.domain_name, certificate_domain),
           location: Nginx::ReverseProxyLocation.new(proxy_url)
         ),
-          Nginx::TlsRedirectServerBlock.new(domain.domain_name),
+          Nginx::TlsRedirectServerBlock.new(domain.domain_names),
           domain: domain
         )
       end
@@ -153,7 +154,7 @@ Finally, re-run this script to configure nginx for TLS.
             listen: Nginx::ListenHttps.new(domain.domain_name, certificate_domain),
             location: Nginx::Location.new
           ),
-          Nginx::TlsRedirectServerBlock.new(domain.domain_name),
+          Nginx::TlsRedirectServerBlock.new(domain.domain_names),
           domain: domain
         )
       end
@@ -207,6 +208,12 @@ Finally, re-run this script to configure nginx for TLS.
             rails_env: rails_env
           )
       end
+
+      def save
+        result = super
+        https_reminder_message
+        result
+      end
     end
 
     class RailsHttps < Rails
@@ -228,7 +235,7 @@ Finally, re-run this script to configure nginx for TLS.
             accel_location: accel_location,
             domain: domain
           ),
-          Nginx::TlsRedirectServerBlock.new(domain.domain_name),
+          Nginx::TlsRedirectServerBlock.new(domain.domain_names),
           domain: domain,
           rails_env: rails_env
         )

data/lib/shared_infrastructure/nginx/listen.rb

@@ -43,7 +43,7 @@ module Nginx
         "# Optimize TLS, from: https://www.bjornjohansen.no/optimizing-https-nginx, steps 1-3",
         "ssl_session_cache shared:SSL:1m; # Enough for 4,000 sessions.",
         "ssl_session_timeout 180m;",
-        "ssl_protocols TLSv1 TLSv1.1 TLSv1.2;",
+        "ssl_protocols TLSv1.3 TLSv1.2;",
         "ssl_prefer_server_ciphers on;",
         "ssl_ciphers ECDH+AESGCM:ECDH+AES256:ECDH+AES128:DH+3DES:!ADH:!AECDH:!MD5;",
         "# Step 4",

data/lib/shared_infrastructure/nginx/server_block.rb

@@ -43,9 +43,9 @@ SERVER_BLOCK
   end
 
   class TlsRedirectServerBlock < ServerBlock
-    def initialize(domain_name)
+    def initialize(*domain_names)
       super(
-        server: Server.new(domain: SharedInfrastructure::Domain.new(domain_name)),
+        server: Server.new(domain: SharedInfrastructure::Domain.new(*domain_names)),
         listen: ListenHttp.new,
         location: RedirectLocation.new
       )

data/lib/shared_infrastructure/runner/base.rb

@@ -28,8 +28,8 @@ module Runner
     end
 
     def process_args(opts = nil)
-      raise MissingArgument.new("domain required", opts) unless ARGV.size == 1
-      { domain_name: ARGV[0] }
+      raise MissingArgument.new("domain required", opts) if ARGV.size == 0
+      { domain_name: ARGV }
     end
 
     def process_options(http_builder_class = Nginx::Builder::SiteHttp,
@@ -106,7 +106,7 @@ module Runner
         options[:protocol]
       else
         certificate_directory = Nginx.certificate_directory(
-          options[:certificate_domain] || options[:domain_name]
+          options[:certificate_domain] || options[:domain_name].first # FIXME:
         )
         if File.exist?(File.join(certificate_directory, "privkey.pem")) &&
            File.exist?(File.join(certificate_directory, "fullchain.pem")) &&

data/lib/shared_infrastructure/runner/reverse_proxy.rb

@@ -11,7 +11,7 @@ module Runner
     def process_args(opts = nil)
       raise MissingArgument.new("domain and target url required", opts) unless ARGV.size == 2
       {
-        domain_name: ARGV[0],
+        domain_name: [ARGV.first],
         proxy_url: ARGV[1]
       }
     end

data/lib/shared_infrastructure/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SharedInfrastructure
-  VERSION = "2.0.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,32 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: shared-infrastructure
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Larry Reid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: chandler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2021-11-15 00:00:00.000000000 Z
+dependencies: []
 description: 'For static sites, Rails apps, and reverse proxies.
 
-'
+  '
 email: lcreid@jadesystems.ca
 executables:
 - create-server-block
@@ -76,8 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Configure nginx, systemd, and/or Puma