capistrano-atlas 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6b213b0d83a08807c027bb88948a74b5784c55d
-  data.tar.gz: a601ee1208dbc0543692b6de3a9a54d0dfb5ceef
+  metadata.gz: c4120b1d9fe3de663fb538b87079b7743a2c6bcb
+  data.tar.gz: 7313f3af674dca5a3e110b8e974c6aa17e88ce4b
 SHA512:
-  metadata.gz: 61468a9fb92634ba91f511774f8ea9e8d11006b3d6c909b60c1a1a255c0942638280ac2dff99c24f1d0031faf4c378b2a754be9536962827fdc038d08ffa3556
-  data.tar.gz: 25196c2b900893d0ffa4442d1c4654f497a6d0405f8842ef102ab45aeaf0cf1cb63ed256fe6c2dc8c7c9bb7014cf6134e0ddd40a7946027d8dcab456cf4b9d2d
+  metadata.gz: 106d96940cc0264c9c09f4f48bc10035705f9cdc0cf53d7409073702b308d6550ab1f05572498530ad9c0edade11c495744e64d5264d4280cfa11f499db17905
+  data.tar.gz: a442bcea0165c975f2a0dd8771106f1c3af07931f8cdd4b21fb7a8e8ce1d0289c7734f4b039e04ed7e11d732fe1476e852e81fbaa1cb376dd79f436a6a2f2ca8

data/lib/capistrano/atlas/version.rb

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

data/lib/capistrano/tasks/ssl.rake

@@ -1,6 +1,6 @@
 atlas_recipe :ssl do
-  after :provision, "generate_dh"
-  after :provision, "configure_lets_encrypt"
+  prior_to "atlas:nginx:configure", "atlas:ssl:generate_dh"
+  prior_to "atlas:nginx:configure", "atlas:ssl:configure_lets_encrypt"
 end
 
 namespace :atlas do
@@ -8,16 +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/#{capistrano_app_name}.crt ]")
+        unless test("sudo [ -f /etc/ssl/#{application_basename}.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 "\
+                         "--webroot -w /var/www/html "\
                          "-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"                         
+          execute :sudo, "ln -s /etc/letsencrypt/live/#{fetch(:atlas_lets_encrypt_domain_name)}/fullchain.pem /etc/ssl/#{application_basename}.crt"
+          execute :sudo, "ln -s /etc/letsencrypt/live/#{fetch(:atlas_lets_encrypt_domain_name)}/privkey.pem /etc/ssl/#{application_basename}.key"                         
         end
       end
     end
@@ -32,4 +32,4 @@ namespace :atlas do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-atlas
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - John McDowall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano