luban 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555b9db7bfefbf548122ebead92affe65ed5269a
-  data.tar.gz: bd4b6318133e7950e21e6c52d17fab5ebe0f1b56
+  metadata.gz: 89d11fd53f23fcf4561d6f6da521b1364110a2b5
+  data.tar.gz: 245fd0714c4b105a2eeedecc31c1517ad4d3bdf3
 SHA512:
-  metadata.gz: af4f00a1aa72e2e61550a0104274e33f3af3a7be6e5dbd19b861422a9022dac1a5a2107af235f19b98894d72c80bbba9fc85b05f3c893d068107e041ad750e6a
-  data.tar.gz: 7d5c2fc63d7b3652588df65fab8261be9ae05266c0691067d1e03d4a199cb20f1b475552d8d8edc6aeb3cef12570b5703dc77370b414778fa0c9f80f2aaf1baa
+  metadata.gz: 6559e03834e6972fe23db6837effed6b77f29157eb2a4dfc8de40df7c7f240b3091480696fb27eb89638ff1689a80904d7f7ae04bde189bd3f0e3bd15917d875
+  data.tar.gz: 3c8a3df7d6f64cec2d5f7209284ca2c804e1c725cb9f40f1ee5ca8f0128e444cc00107a55ea25213c86808d294b49c879c4d5eee7223f654f0986dc73476d137

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 
+## Version 0.9.6 (Oct 18, 2016)
+
+Minor enhancements:
+  * Added logrotate configuration template for cronjobs in deployment application skeleton
+
+Bug fixes:
+  * Checked authorization for all public keys before setting up promptless authentication
+    * Especially useful for multiple public keys passed in to setup promptless authentication
+
 ## Version 0.9.5 (Oct 18, 2016)
 
 New features:

data/lib/luban/deployment/cli/application/authenticator.rb

@@ -2,6 +2,12 @@ module Luban
   module Deployment
     class Application
       class Authenticator < Luban::Deployment::Worker::Base
+        def public_keys
+          @public_keys = task.opts.public_keys || []
+          @public_keys.uniq!
+          @public_keys
+        end
+
         def private_key_file_name
           @private_key_file_name ||= "id_#{authen_key_type}"
         end
@@ -64,7 +70,7 @@ module Luban
         def promptless_authen_enabled?
           origin_auth_methods = host.ssh_options[:auth_methods]
           host.ssh_options[:auth_methods] = %w(publickey)
-          capture('echo ok') == 'ok'
+          capture('echo ok') == 'ok' and keys_authorzied?
         rescue Net::SSH::AuthenticationFailed
           false
         ensure
@@ -84,8 +90,6 @@ module Luban
         end
 
         def add_authorized_keys
-          public_keys = task.opts.public_keys || []
-          public_keys.uniq!
           if file?(authorized_keys_file_path)
             public_keys.each { |k| add_authorized_key(k) unless key_authorized?(k) }
           else
@@ -100,6 +104,14 @@ module Luban
         def key_authorized?(key)
           test("grep -v \"^#\" #{authorized_keys_file_path} | grep -Fxq \"#{key}\"")
         end
+
+        def keys_authorzied?
+          if file?(authorized_keys_file_path)
+            public_keys.all? { |k| key_authorized?(k) }
+          else
+            false
+          end
+        end
       end
     end
   end

data/lib/luban/deployment/templates/application/config/templates/profile/app/crontab.logrotate.erb.erb

@@ -0,0 +1,15 @@
+# Crontab logrotate configuration
+
+<%%= log_path.join('cron.*.log') %> {
+  hourly
+  maxsize 5M
+  maxage 14
+  rotate <%%= 14 * 24 * (60 / 10) %>
+  missingok
+  compress
+  compresscmd <%%= `which gzip`.chomp %>
+  delaycompress
+  dateext
+  dateformat -%Y%m%d-%H%M%S
+  olddir archived_logs
+}

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Rubyist Lei
@@ -161,6 +161,7 @@ files:
 - lib/luban/deployment/templates/application/config/deploy/__stage/profile/.gitkeep
 - lib/luban/deployment/templates/application/config/deploy/__stage/templates/.gitkeep
 - lib/luban/deployment/templates/application/config/templates/profile/.gitkeep
+- lib/luban/deployment/templates/application/config/templates/profile/app/crontab.logrotate.erb.erb
 - lib/luban/deployment/templates/application/lib/application.rb.erb
 - lib/luban/deployment/templates/crontab.erb
 - lib/luban/deployment/templates/crontab_footer.erb