capistrano-atlas 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17fabd2ccbdb2576da14c4a9bcb6bfcf1369b0b1
-  data.tar.gz: db88375f4ab66466e465ebd50c7986337b3c382d
+  metadata.gz: a6b213b0d83a08807c027bb88948a74b5784c55d
+  data.tar.gz: a601ee1208dbc0543692b6de3a9a54d0dfb5ceef
 SHA512:
-  metadata.gz: d92fffd9e8d165c4e6b6ccede3d3168eb0d03a1f18455af98e97afc881d79efda162c8426980bb7f77a3ec9be1017694c68d935025956fa657b9a567663905fb
-  data.tar.gz: 3ba976969f2329e12eabd96cbdad57b8d86fbb27ce6fdffb5e167e4a8e9dda469d4c33bb7f71fe8b624369313c746702869e2f888ca457d42024806b1ccdb783
+  metadata.gz: 61468a9fb92634ba91f511774f8ea9e8d11006b3d6c909b60c1a1a255c0942638280ac2dff99c24f1d0031faf4c378b2a754be9536962827fdc038d08ffa3556
+  data.tar.gz: 25196c2b900893d0ffa4442d1c4654f497a6d0405f8842ef102ab45aeaf0cf1cb63ed256fe6c2dc8c7c9bb7014cf6134e0ddd40a7946027d8dcab456cf4b9d2d

data/lib/capistrano/atlas/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Atlas
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

data/lib/capistrano/tasks/ssl.rake

@@ -1,6 +1,6 @@
 atlas_recipe :ssl do
-  during :provision, "generate_dh"
-  during :provision, "configure_lets_encrypt"
+  after :provision, "generate_dh"
+  after :provision, "configure_lets_encrypt"
 end
 
 namespace :atlas do
@@ -8,13 +8,16 @@ namespace :atlas do
     desc "Setup Let's Encrypt and get a free certificate"
     task :configure_lets_encrypt do
       privileged_on roles(:web) do
-        unless test("sudo [ -f /etc/ssl/#{application_basename}.crt ]")
+        unless test("sudo [ -f /etc/ssl/#{capistrano_app_name}.crt ]")
           execute :sudo, "mkdir -p /opt/certbot"
           execute :sudo, "wget https://dl.eff.org/certbot-auto -O /opt/certbot/certbot-auto && chmod a+x /opt/certbot/certbot-auto"
           execute :sudo, "/opt/certbot/certbot-auto certonly --agree-tos "\
-                         "--email #{fetch(:atlas_lets_encrypt_email)} --webroot "\
-                         "-w #{current_path}/public "\
+                         "--email #{fetch(:atlas_lets_encrypt_email)} "\
+                         "--webroot -w #{current_path}/public "\
                          "-d #{fetch(:atlas_lets_encrypt_domain_name)}"
+
+          execute :sudo, "ln -s /etc/letsencrypt/live/#{production_hostname}/fullchain.pem /etc/ssl/#{capistrano_app_name}.crt"
+          execute :sudo, "ln -s /etc/letsencrypt/live/#{production_hostname}/privkey.pem /etc/ssl/#{capistrano_app_name}.key"                         
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-atlas
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John McDowall