letsencrypt_webfaction 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af7ee3bd54d72597507203c29fde8eff7d728e5f
-  data.tar.gz: daa72bd1e20af802d19d287327aeda6173d318ba
+  metadata.gz: 42e083a1af389265e34c4cf101642a5f8cd6c540
+  data.tar.gz: 49284cd35d75161182e0cd3339425151a7c902f6
 SHA512:
-  metadata.gz: 7ff9869a8653f549d7a5ff1f4aa019b63f64bdad67f997a03ec82314fd4024167a5755fdb8224eff38111914ec3bab26d7cf395eff467ac48f12d47226163edf
-  data.tar.gz: ac8afb96fce634f3fa7f41a50862ba50783610b3a6a898bce7fe16b22a68d5338e71d65de6645d31d125ade6c4240a9e5dd697fb84fb0b23160a5de2a50e0cd4
+  metadata.gz: 16454306b99d75d1ebb393e21945d2778ff771374e83955509b1852c5dca09a5a338256509c98b191b96e0bd514b1a2fa3ff2ac5900095e603f8e39e043fa7e8
+  data.tar.gz: 93872050bf6e81c6948fac2fc762757b9331fdc2db061d117162cc1c360971087441bf37b19988eb3ea1f8b4f007a7a2cec27f9a432e278d3214dd33b2bf7dbd

data/.rubocop.yml

@@ -18,7 +18,7 @@ Metrics/BlockLength:
     - 'spec/**/*'
 
 # I'm not pulling in a library, or forcing Ruby 2.3+
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
   Enabled: false
 
 # Extra cops:
@@ -28,13 +28,13 @@ Style/AutoResourceCleanup:
   Enabled: true
 
 # Standardize multi-line params.
-Style/FirstArrayElementLineBreak:
+Layout/FirstArrayElementLineBreak:
   Enabled: true
-Style/FirstHashElementLineBreak:
+Layout/FirstHashElementLineBreak:
   Enabled: true
-Style/FirstMethodArgumentLineBreak:
+Layout/FirstMethodArgumentLineBreak:
   Enabled: true
-Style/FirstMethodParameterLineBreak:
+Layout/FirstMethodParameterLineBreak:
   Enabled: true
 
 # Encourage using public_send to prove that you actually want to bypass visibility.

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v2.1.0
+
+* Allow multiple public directories to be used. The authorization responses will be duplicated across all of them, allowing a single cert to serve multiple applications. Fixes #96 (thanks @lsemprini for the suggestion!)
+
 v2.0.1
 
 * Check WebFaction credentials before issuing cert.

data/README.md

@@ -116,6 +116,8 @@ The basic parameters are as follows:
 
     In some cases (such as with some Node.js or Python applications), you may need to create this folder. See [here](https://github.com/will-in-wi/letsencrypt-webfaction/issues/24) for an example of this workaround.
 
+    You can specify multiple public directories in this option, separated by commas. This is useful when you want to create a single certificate that serves multiple domains that happen to be backed by multiple different public directories. During Let's Encrypt's http01 challenge-response, letsencrypt-webfaction will copy all the challenge files for all domains into all the public directories. Let's Encrypt supports up to 100 domains per certificate, and they discuss the pros and cons of the multiple-domain technique here: https://letsencrypt.org/docs/integration-guide/
+
 * `--username`
 
     The username you use to log into the Webfaction control panel. Needed along with the password to upload your cert to their API.
@@ -143,7 +145,7 @@ To test certificate issuance, consider using the [LetsEncrypt staging server](ht
 
 A test command could thus be something like the following:
 
-    $ letsencrypt_webfaction --letsencrypt_account_email you@youremail.com --domains yourdomain.com,www.yourdomain.com --public ~/webapps/yourapp/wordpress/ --endpoint https://acme-staging.api.letsencrypt.org/
+    $ letsencrypt_webfaction --letsencrypt_account_email you@youremail.com --domains yourdomain.com,www.yourdomain.com --public ~/webapps/yourapp/wordpress/ --username <webfaction-username> --password <webfaction-password> --endpoint https://acme-staging.api.letsencrypt.org/
 
 
 ### Operation

data/config.defaults.yml

@@ -2,7 +2,7 @@ key_size: 4096
 # We need an ACME server to talk to, see github.com/letsencrypt/boulder
 endpoint: 'https://acme-v01.api.letsencrypt.org/'
 domains: []
-public: ''
+public: []
 output_dir: '~/le_certs/'
 letsencrypt_account_email: ''
 api_url: 'https://api.webfaction.com/'

data/letsencrypt_webfaction.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'letsencrypt_webfaction'

data/lib/letsencrypt_webfaction.rb

@@ -1,3 +1,3 @@
 module LetsencryptWebfaction
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/lib/letsencrypt_webfaction/args_parser.rb

@@ -18,7 +18,7 @@ module LetsencryptWebfaction
       Field::IntegerField.new(:key_size, 'Size of private key (e.g. 4096)', [DefinedValuesValidator.new(VALID_KEY_SIZES)]),
       Field.new(:endpoint, 'ACME endpoint (e.g. https://acme-v01.api.letsencrypt.org/)', [StringValidator.new]),
       Field::ListField.new(:domains, 'Comma separated list of domains. The first one will be the common name.', [ArrayValidator.new]),
-      Field.new(:public, 'Location on the filesystem served by the desired site (e.g. ~/webapps/myapp/public_html)', [StringValidator.new]),
+      Field::ListField.new(:public, 'Locations on the filesystem served by the desired sites (e.g. "~/webapps/myapp/public_html,~/webapps/myapp1/public_html")', [ArrayValidator.new]),
       Field.new(:output_dir, 'Location on the filesystem to which the certs will be saved.', [StringValidator.new]),
       Field.new(:letsencrypt_account_email, 'The email address associated with your account.', [StringValidator.new]),
       Field.new(:api_url, 'The URL to the Webfaction API.', [StringValidator.new]),

data/lib/letsencrypt_webfaction/domain_validator.rb

@@ -2,10 +2,10 @@ require 'fileutils'
 
 module LetsencryptWebfaction
   class DomainValidator
-    def initialize(domains, client, public_dir)
+    def initialize(domains, client, public_dirs)
       @domains = domains
       @client = client
-      @public_dir = File.expand_path(public_dir)
+      @public_dirs = public_dirs.map { |dir| File.expand_path(dir) }
     end
 
     def validate!
@@ -38,11 +38,13 @@ module LetsencryptWebfaction
 
     def write_files!
       challenges.each do |challenge|
-        # Save the file. We'll create a public directory to serve it from, and we'll creating the challenge directory.
-        FileUtils.mkdir_p(File.join(@public_dir, File.dirname(challenge.filename)))
+        @public_dirs.each do |public_dir|
+          # Save the file. We'll create a public directory to serve it from, and we'll creating the challenge directory.
+          FileUtils.mkdir_p(File.join(public_dir, File.dirname(challenge.filename)))
 
-        # Then writing the file
-        File.write(File.join(@public_dir, challenge.filename), challenge.file_content)
+          # Then writing the file
+          File.write(File.join(public_dir, challenge.filename), challenge.file_content)
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_webfaction
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - William Johnston
@@ -30,7 +30,7 @@ cert_chain:
   Bgn1/q+P8H+/qkt6w5h8UzWYyXRlEjWvSJEjkNU0C05GQ0w0GFiqd62CgQty5xpa
   7M3NhWEjOZHE18Ro4Vy9CQCJxUasYC4JUMMQ9tQBW+vYIgHfBn0+xlw=
   -----END CERTIFICATE-----
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client