dokku-installer-cli 0.0.9.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efdbbf29a6689ac47ae2789202110a8e53ef1217
-  data.tar.gz: 7d40bd2280a82dda73ed896f8d824fe034e0a7b0
+  metadata.gz: bb69b1d5b49e5ec10f762a35e86f9c96dd0d3265
+  data.tar.gz: 1a00ea3628b1602afee769f3ad7732dcf37ff8f7
 SHA512:
-  metadata.gz: 73d9b44e5313b70c54ec8019bb3f75c0f3c13dc773a29337db9eb1dbdcf07cd303a15022ffd8cbc3bbac16ce526573c11e3c7bf040c3ab4b8f806e9d6860d37a
-  data.tar.gz: 200f2d17a313e5ecc85b52e61cd03f4b8a72fb1a136b4a38f8e944b45d3e0536d8ec0043ebe8a5c76157e24c415da749714de67e8040b96b90dd7a24662b5943
+  metadata.gz: b0278f0567b864c9df21593471c987f459c9d243b9b3e26a43eed04a8fa5570764670eaa9506a49e7edfa901c7b33790a73c70c684d8c24bf62ca47bbc5c3c27
+  data.tar.gz: fefdcc7ca36f849629a4cf176b8f67e035d7e9829efbd5e10cb0aa928891a2b352b18a1e2eb593ff000b10c48054a9cd032ef3a1db8ff77a0504550700c946fc

data/lib/dokku_installer/ssl.rb

@@ -1,24 +1,66 @@
 module DokkuInstaller
   class Cli < Thor
 
-    desc "ssl:certificate <file path>", "Add a signed certificate for SSL (server.crt)"
-    def ssl_certificate(*args)
-      file_path = args.first
-      file_contents = File.read(file_path)
-      command = "echo \"#{file_contents}\" | ssh dokku@#{domain} ssl:certificate #{app_name}"
+    # certs:add CRT KEY            #  Add an ssl endpoint to an app.
+    # certs:chain CRT [CRT ...]    #  Print the ordered and complete chain for the given certificate.
+    # certs:info                   #  Show certificate information for an ssl endpoint.
+    # certs:key CRT KEY [KEY ...]  #  Print the correct key for the given certificate.
+    # certs:remove                 #  Remove an SSL Endpoint from an app.
+    # certs:rollback               #  Rollback an SSL Endpoint for an app.
+    # certs:update CRT KEY         #  Update an SSL Endpoint on an app.
 
-      puts "Running #{command}..."
+    desc "ssl:add CRT KEY", "Add an SSL endpoint."
+    def ssl_add(*args)
+      key = nil
+      certificate = nil
+      intermediate_certificates = []
+
+      args.each do |arg|
+        file_contents = File.read(arg)
+        if file_contents.include?("KEY")
+          key = file_contents
+        elsif file_contents.include?("BEGIN CERTIFICATE")
+          certificate = file_contents
+        elsif file_contents.include?("NEW CERTIFICATE REQUEST")
+          intermediate_certificates << file_contents
+        end
+      end
+
+      if key.nil?
+        puts "Missing SSL private key.\nSpecify the key, certificate, and any intermediate certificates."
+        exit
+      elsif certificate.nil?
+        puts "Missing SSL certificate.\nSpecify the key, certificate, and any intermediate certificates."
+        exit
+      end
+
+      puts "Adding SSL private key..."
+      command = "echo \"#{key}\" | ssh dokku@#{domain} ssl:key #{app_name}"
+      result = `#{command}`
+
+      puts "Adding SSL certificate..."
+      combined_certificate = certificate
+      if intermediate_certificates.length > 0
+        combined_certificate += "#{intermediate_certificates.join("\n")}\n"
+      end
+      command = "echo \"#{combined_certificate}\" | ssh dokku@#{domain} ssl:certificate #{app_name}"
       exec(command)
     end
 
-    desc "ssl:key <file path>", "Add a private key for SSL (server.key)"
-    def ssl_key(*args)
-      file_path = args.first
-      file_contents = File.read(file_path)
-      command = "echo \"#{file_contents}\" | ssh dokku@#{domain} ssl:key #{app_name}"
+    desc "ssl:force DOMAIN", "Force SSL on the given domain."
+    def ssl_force(*args)
+      domain = args.first
+      if domain.nil?
+        puts "Specify a domain to force SSL."
+        exit
+      end
 
-      puts "Running #{command}..."
-      exec(command)
+      run_command "ssl:force #{app_name} #{domain}"
+    end
+
+    desc "ssl:remove", "Remove an SSL endpoint."
+    def ssl_remove
+      run_command "ssl:delete #{domain} #{app_name}"
     end
 
   end

data/lib/dokku_installer/version.rb

@@ -1,3 +1,3 @@
 module DokkuInstaller
-  VERSION = "0.0.9.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dokku-installer-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor