capistrano-psw 1.0.0.pre21 → 1.0.0.pre22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9884521847ee66ef36282c26a24f28f4dfec8746
-  data.tar.gz: a742a271d96569895ee0790868e56664473e98f9
+  metadata.gz: 999e9ae51335b17cb654243ca149be8f440b0705
+  data.tar.gz: 33f0d884b2cf9bde5a0f11745e69110176e681d3
 SHA512:
-  metadata.gz: bb10396dc0ae27c7cf37a3e950d132ba60839373a7582c9241dcf4a8c1685e77a9d4c50d49c5285418c7b4cb663a8e1cc636ca93b48d3e8b83109947b08bdfea
-  data.tar.gz: 3562e77622a06adb9ebdd849c8d0cd18cc632eb669e3ec37da0258aa73631b0d3c44ad84fc97558d4d8940dfef6b3c2df769eaff36d8c4cf4c3989bdec1f177e
+  metadata.gz: e04a50f733cdf9e4083936f98b016d6761d6a76bb5130dca5e2a16e1f22eae0b882c85fc2e67dd9ff1dd586730711d92e8ab75a91506e028b8e1d13234d9fb39
+  data.tar.gz: 04acbeb3d0b3920770dab2af7bdbf8bbf59b838776049656f7c6ed1fd8f08017c97ca1197d62b4fc338dcceed81e6e085f3dd49ca785878a10add24449ded413

data/lib/capistrano/psw/version.rb

@@ -10,6 +10,6 @@
 
 module Capistrano
   module Psw
-    VERSION = "1.0.0.pre21"
+    VERSION = "1.0.0.pre22"
   end
 end

data/resources/lib/capistrano/tasks/psw-apache2.cap

@@ -63,19 +63,19 @@
 require 'tempfile'
 require 'pathname'
 require 'capistrano/psw/peppr_app_deploy_file_utils'
- 
+  
 namespace :psw_apache2 do
 
   #ssl cert properties
-  def get_ssl_cert_file
+  def get_apache2_ssl_cert_file
     fetch(:psw_apache2_ssl_cert_file, "")
   end
 
-  def get_ssl_key_file
+  def get_apache2_ssl_key_file
     fetch(:psw_apache2_ssl_key_file, "")
   end
 
-  def get_ssl_chain_file
+  def get_apache2_ssl_chain_file
     fetch(:psw_apache2_ssl_chain_file, "")
   end  
 
@@ -102,21 +102,21 @@ namespace :psw_apache2 do
       info "Creating cert key directory..."
       sudo :mkdir, '-p', ssl_private_dir
 
-      ssl_cert_file = "#{get_ssl_cert_file}"
+      ssl_cert_file = "#{get_apache2_ssl_cert_file}"
       ssl_cert_filename = Pathname.new(ssl_cert_file).basename
       info "Copying certificate (#{ssl_cert_file}) to cert directory..."
       sudo :rm, "-rf", "#{ssl_cert_dir}/#{ssl_cert_filename}"
       sudo :cp, ssl_cert_file, ssl_cert_dir
       sudo :chmod, '600', "#{ssl_cert_dir}/#{ssl_cert_filename}"
 
-      ssl_key_file = "#{get_ssl_key_file}"
+      ssl_key_file = "#{get_apache2_ssl_key_file}"
       ssl_key_filename = Pathname.new(ssl_key_file).basename
       info "Copying certificate key (#{ssl_key_file}) to key directory..."
       sudo :rm, '-rf', "#{ssl_private_dir}/#{ssl_key_filename}"
       sudo :cp, ssl_key_file, ssl_private_dir
       sudo :chmod, '600', "#{ssl_private_dir}/#{ssl_key_filename}"
 
-      ssl_chain_file = "#{get_ssl_chain_file}"
+      ssl_chain_file = "#{get_apache2_ssl_chain_file}"
       ssl_chain_filename = Pathname.new(ssl_chain_file).basename
       info "Copying certificate key (#{ssl_chain_file}) to cert directory..."
       sudo :rm, '-rf', "#{ssl_cert_dir}/#{ssl_chain_filename}"

data/resources/lib/capistrano/tasks/psw-nginx.cap

@@ -49,15 +49,15 @@
 #
 require 'tempfile'
 require 'pathname'
-
+ 
 namespace :psw_nginx do
 
   #ssl cert properties
-  def get_ssl_cert_file
+  def get_nginx_ssl_cert_file
     fetch(:psw_nginx_ssl_cert_file, "")
   end
 
-  def get_ssl_key_file
+  def get_nginx_ssl_key_file
     fetch(:psw_nginx_ssl_key_file, "")
   end  
 
@@ -84,14 +84,14 @@ namespace :psw_nginx do
       info "Creating cert key directory..."
       sudo :mkdir, '-p', ssl_private_dir
 
-      ssl_cert_file = "#{get_ssl_cert_file}"
+      ssl_cert_file = "#{get_nginx_ssl_cert_file}"
       ssl_cert_filename = Pathname.new(ssl_cert_file).basename
       info "Copying certificate (#{ssl_cert_file}) to key directory..."
       sudo :rm, "-rf", "#{ssl_cert_dir}/#{ssl_cert_filename}"
       sudo :cp, ssl_cert_file, ssl_cert_dir
       sudo :chmod, '600', "#{ssl_cert_dir}/#{ssl_cert_filename}"
 
-      ssl_key_file = "#{get_ssl_key_file}"
+      ssl_key_file = "#{get_nginx_ssl_key_file}"
       ssl_key_filename = Pathname.new(ssl_key_file).basename
       info "Copying certificate key (#{ssl_key_file}) to key directory..."
       sudo :rm, '-rf', "#{ssl_private_dir}/#{ssl_key_filename}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-psw
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre21
+  version: 1.0.0.pre22
 platform: ruby
 authors:
 - Lexmark International Technology S.A