h2o-configurator 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aabac121ceb4c0d23fb3c192e63ec9c0c6d880fd342fca83f920f384ee6ea3d
-  data.tar.gz: 4e48dcb4143a0c2ae0558f6f16bf3d3efa0ecedbb495b88ad80d5ec17e26bc15
+  metadata.gz: a1249082a62a2b5a079c0b020eb686567171128d7e890b91de8820c0af621f38
+  data.tar.gz: 4becf75eb92462af854556427571d5e0a387eda0444403f53a3e4d29e9bbe8a6
 SHA512:
-  metadata.gz: c43dbe0b66c4d3fa6617c87be84a16a1e4a645e862f929f0322ffb2d6062a37eaed907a4c315c1c986bfca0fd73f6d1c7546749113151d9aacd886edfddcf899
-  data.tar.gz: ea3d7fbac40494bf30414f1f5f150dd8a654a25a386e8cb97638295900830ad50da007548c7b73bbc6946215bba8dadddbbec79931d1a91ae4063d6ccd4b1f60
+  metadata.gz: b6de83ab48209998cd51512a4ef022531df7a51f41b7b3250128a0cf99c8fbe197c5d4a7696ba0141672cdeaa230a8dfd126c7919eaa518d86607795b95fb37b
+  data.tar.gz: 217c7cd7bd7546cca8ca3acc28ea889d8f11d0e25acdcc3f657d196ec177de5de4077ea6f5f287a19ad57955a83083111cb187f105cd5bb5b7decd0166da97ff

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,21 @@
+PATH
+  remote: .
+  specs:
+    h2o-configurator (0.6)
+      path (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    path (2.0.1)
+    rake (0.9.6)
+
+PLATFORMS
+  x86_64-darwin-18
+
+DEPENDENCIES
+  h2o-configurator!
+  rake (~> 0)
+
+BUNDLED WITH
+   2.2.3

data/bin/h2o-configurator

@@ -2,7 +2,7 @@
 
 require 'h2o-configurator'
 
-configurator = H2OConfigurator::Builder.new
+configurator = H2OConfigurator::Builder.new(ARGV.empty? ? nil : ARGV)
 begin
   configurator.write_config
 rescue H2OConfigurator::Error => e

data/h2o-configurator.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'path', '~> 2.0'
 
-  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

data/lib/h2o-configurator.rb

@@ -2,7 +2,7 @@ require 'path'
 require 'yaml'
 
 require 'h2o-configurator/builder'
-require 'h2o-configurator/site'
+require 'h2o-configurator/host'
 require 'h2o-configurator/version'
 
 module H2OConfigurator
@@ -21,8 +21,6 @@ module H2OConfigurator
   CertBaseDir = Path.new('/etc/letsencrypt/live')
   ServerCertificateFilename = 'fullchain.pem'
   PrivateKeyFilename = 'privkey.pem'
-  DomainPrefixes = %w{www.}
-  DomainSuffixes = %w{.test}
 
   class Error < Exception; end
 

data/lib/h2o-configurator/builder.rb

@@ -2,17 +2,23 @@ module H2OConfigurator
 
   class Builder
 
+    def initialize(site_dirs=nil)
+      @site_dirs = site_dirs ? site_dirs.map { |p| Path.new(p) } : Path.glob(SitesDirGlob)
+    end
+
     def make_config
+      @site_dirs.reject! { |p| p.extname == '.old' || p.extname == '.new' }
+      raise "No sites defined" if @site_dirs.empty?
       config = {
         'compress' => 'ON',
         'reproxy' => 'ON',
         'error-log' => ErrorLogFile.to_s,
         'hosts' => {},
       }
-      Path.glob(SitesDirGlob).reject { |p| p.extname == '.old' || p.extname == '.new' }.each do |site_dir|
-        site = Site.new(site_dir)
-        puts "%30s => %s" % [site.name, site.dir]
-        config['hosts'].merge!(site.make_config)
+      @site_dirs.sort.each do |dir|
+        host = Host.new(dir)
+        puts "%30s => %s" % [host.name, host.dir]
+        config['hosts'].merge!(host.make_config)
       end
       config
     end

data/lib/h2o-configurator/{site.rb → host.rb}

@@ -1,6 +1,6 @@
 module H2OConfigurator
 
-  class Site
+  class Host
 
     attr_accessor :dir
     attr_accessor :name
@@ -11,44 +11,39 @@ module H2OConfigurator
     end
 
     def make_config
-      config = {}
       if cert_dir.exist?
-        https_redirect_host_config = make_https_redirect_host_config(80)
-        host_config = make_host_config(443)
+        config_http = make_https_redirect_host_config(80)
+        config_https = make_host_config(443)
+        {
+          "#{@name}:80" => config_http,
+          "*.#{@name}:80" => config_http,
+          "#{@name}:443" => config_https,
+          "*.#{@name}:443" => config_https,
+        }
       else
-        https_redirect_host_config = nil
-        host_config = make_host_config(80)
-      end
-      domains.each do |domain|
-        if https_redirect_host_config
-          config["#{domain}:80"] = https_redirect_host_config
-          config["#{domain}:443"] = host_config
-        else
-          config["#{domain}:80"] = host_config
-        end
+        config_http = make_host_config(80)
+        {
+          "#{@name}:80" => config_http,
+          "*.#{@name}:80" => config_http,
+        }
       end
-      config
-    end
-
-    def domains
-      ([''] + DomainPrefixes).map do |prefix|
-        ([''] + DomainSuffixes).map do |suffix|
-          "#{prefix}#{@name}#{suffix}"
-        end
-      end.flatten
     end
 
     def make_host_config(port)
       config = {
-        'listen' => {
-          'port' => port,
-        },
+        'listen' => { 'port' => port },
         'access-log' => access_log_file.to_s,
         'setenv' => { 'HOST_DIR' => @dir.to_s },
-        'paths' => {
-          '/' => make_handlers,
-        },
       }
+      if proxy_reverse_url_file.exist?
+        config['paths'] = {
+          '/' => { 'proxy.reverse.url' => proxy_reverse_url_file.read.chomp }
+        }
+      else
+        config['paths'] = {
+          '/' => make_handlers
+        }
+      end
       if server_certificate_file.exist? && private_key_file.exist?
         config['listen']['ssl'] = {
           'certificate-file' => server_certificate_file.to_s,
@@ -121,6 +116,10 @@ module H2OConfigurator
       @dir / '.htpasswd'
     end
 
+    def proxy_reverse_url_file
+      @dir / '.proxy-reverse-url'
+    end
+
     def access_log_file
       H2OConfigurator::H2OLogDir / "#{@name}.access.log"
     end

data/lib/h2o-configurator/version.rb

@@ -1,5 +1,5 @@
 module H2OConfigurator
 
-  VERSION = '0.5'
+  VERSION = '0.6'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2o-configurator
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - John Labovitz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: path
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 description: H2OConfigurator builds H2O config files.
 email:
 - johnl@johnlabovitz.com
@@ -47,6 +47,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -56,13 +58,13 @@ files:
 - lib/h2o-configurator/builder.rb
 - lib/h2o-configurator/handlers/auto-extension.rb
 - lib/h2o-configurator/handlers/redirect.rb
-- lib/h2o-configurator/site.rb
+- lib/h2o-configurator/host.rb
 - lib/h2o-configurator/version.rb
 homepage: https://github.com/jslabovitz/h2o-configurator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Build H2O config files.
 test_files: []