letsencrypt-rails-heroku 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e52fe099de5ee4ec2a76f81758b050ab66caf18
-  data.tar.gz: 9b14169c10ca75a1c13528112ac3676b544eba46
+  metadata.gz: c3f97585c884a70e519fdc84a79276ab7abb845e
+  data.tar.gz: 04ecb09cedcc720fbfb2eb87175f68165eab842f
 SHA512:
-  metadata.gz: 493348f0881e833bf90e356dc272a0a4d809da85d50cc7ac753d0a303a5318e30182014be2ffad622beb64bbc278d47b61b8fb287a53153dadd09154940f31dd
-  data.tar.gz: 9832dd1809e3207587c479737db0e6d89f3cce519fa69566153713d298c7037f8fdb09b0dbbc916ddf48b07e1841397d0fa4cff0bcf7373565c474334f70ea3d
+  metadata.gz: 9b52c79ddaf3970f102d6c24b4baa210fb78ec162a83e44ee1cf858dbdfd5acef0498d5a0e2f8050d83442b6abecc1d34f39753bd8ef8643083138ecd4729208
+  data.tar.gz: c9d16e37682bfd2649b9e5a42aa587e574e31fc9aff5f6e4454bcf41092931998ebe3bd2362c7f6c37ffc2b7690483035a2b12fba462a641e04f549b6a6edade

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.0
+
+ - Support SSL Endpoint configuration, as well as the default SNI.
+
 # 1.1.3
 
  - 1.1.1 wasn't a correct fix for catching redirects during polling, this

data/README.md

@@ -73,6 +73,9 @@ which you should set.
  * `ACME_EMAIL`: Your email address, should be valid.
  * `HEROKU_TOKEN`: An API token for this app. See below
  * `HEROKU_APP`: Name of Heroku app e.g. bottomless-cavern-7173
+ * `SSL_TYPE`: Optional: One of `sni` or `endpoint`, defaults to `sni`.
+   `endpoint` requires your app to have an
+   [SSL endpoint addon](https://elements.heroku.com/addons/ssl) configured.
 
 The gem itself will temporarily create additional environment variables during
 the challenge / validation process:
@@ -180,8 +183,6 @@ Your domain is still configured as a CNAME or ALIAS to `your-app.herokuapp.com`.
 - Provide instructions for running the gem decoupled from the app it is 
   securing, for the paranoid.
 
-- Support non-SNI Heroku SSL too.
-
 ## Contributing
 
 - Check out the latest master to make sure the feature hasn't been implemented

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/letsencrypt-rails-heroku.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: letsencrypt-rails-heroku 1.1.3 ruby lib
+# stub: letsencrypt-rails-heroku 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "letsencrypt-rails-heroku"
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Pixie Labs", "David Somers", "Abigail McPhillips"]
-  s.date = "2017-02-28"
+  s.date = "2017-03-03"
   s.description = "This gem automatically handles creation, renewal, and applying SSL certificates from LetsEncrypt to your Heroku account."
   s.email = "team@pixielabs.io"
   s.extra_rdoc_files = [

data/lib/letsencrypt-rails-heroku/letsencrypt.rb

@@ -15,7 +15,8 @@ module Letsencrypt
   end
 
   class Configuration
-    attr_accessor :heroku_token, :heroku_app, :acme_email, :acme_domain, :acme_endpoint
+    attr_accessor :heroku_token, :heroku_app, :acme_email, :acme_domain,
+      :acme_endpoint, :ssl_type
     
     # Not settable by user; part of the gem's behaviour.
     attr_reader :acme_challenge_filename, :acme_challenge_file_content
@@ -26,6 +27,7 @@ module Letsencrypt
       @acme_email = ENV["ACME_EMAIL"]
       @acme_domain = ENV["ACME_DOMAIN"]
       @acme_endpoint = ENV["ACME_ENDPOINT"] || 'https://acme-v01.api.letsencrypt.org/'
+      @ssl_type = ENV["SSL_TYPE"] || 'sni'
       @acme_challenge_filename = ENV["ACME_CHALLENGE_FILENAME"]
       @acme_challenge_file_content = ENV["ACME_CHALLENGE_FILE_CONTENT"]
     end

data/lib/tasks/letsencrypt.rake

@@ -117,20 +117,27 @@ namespace :letsencrypt do
 
     # Send certificates to Heroku via API
 
+    endpoint = case Letsencrypt.configuration.ssl_type
+               when 'sni'
+                 heroku.sni_endpoint
+               when 'endpoint'
+                 heroku.ssl_endpoint
+               end
+
     # First check for existing certificates:
-    certificates = heroku.sni_endpoint.list(heroku_app)
+    certificates = endpoint.list(heroku_app)
 
     begin
       if certificates.any?
         print "Updating existing certificate #{certificates[0]['name']}..."
-        heroku.sni_endpoint.update(heroku_app, certificates[0]['name'], {
+        endpoint.update(heroku_app, certificates[0]['name'], {
           certificate_chain: certificate.fullchain_to_pem,
           private_key: certificate.request.private_key.to_pem
         })
         puts "Done!"
       else
         print "Adding new certificate..."
-        heroku.sni_endpoint.create(heroku_app, {
+        endpoint.create(heroku_app, {
           certificate_chain: certificate.fullchain_to_pem,
           private_key: certificate.request.private_key.to_pem
         })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt-rails-heroku
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Pixie Labs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client