capistrano-psw 1.0.0.pre21 → 1.0.0.pre22
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 999e9ae51335b17cb654243ca149be8f440b0705
|
4
|
+
data.tar.gz: 33f0d884b2cf9bde5a0f11745e69110176e681d3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e04a50f733cdf9e4083936f98b016d6761d6a76bb5130dca5e2a16e1f22eae0b882c85fc2e67dd9ff1dd586730711d92e8ab75a91506e028b8e1d13234d9fb39
|
7
|
+
data.tar.gz: 04acbeb3d0b3920770dab2af7bdbf8bbf59b838776049656f7c6ed1fd8f08017c97ca1197d62b4fc338dcceed81e6e085f3dd49ca785878a10add24449ded413
|
@@ -63,19 +63,19 @@
|
|
63
63
|
require 'tempfile'
|
64
64
|
require 'pathname'
|
65
65
|
require 'capistrano/psw/peppr_app_deploy_file_utils'
|
66
|
-
|
66
|
+
|
67
67
|
namespace :psw_apache2 do
|
68
68
|
|
69
69
|
#ssl cert properties
|
70
|
-
def
|
70
|
+
def get_apache2_ssl_cert_file
|
71
71
|
fetch(:psw_apache2_ssl_cert_file, "")
|
72
72
|
end
|
73
73
|
|
74
|
-
def
|
74
|
+
def get_apache2_ssl_key_file
|
75
75
|
fetch(:psw_apache2_ssl_key_file, "")
|
76
76
|
end
|
77
77
|
|
78
|
-
def
|
78
|
+
def get_apache2_ssl_chain_file
|
79
79
|
fetch(:psw_apache2_ssl_chain_file, "")
|
80
80
|
end
|
81
81
|
|
@@ -102,21 +102,21 @@ namespace :psw_apache2 do
|
|
102
102
|
info "Creating cert key directory..."
|
103
103
|
sudo :mkdir, '-p', ssl_private_dir
|
104
104
|
|
105
|
-
ssl_cert_file = "#{
|
105
|
+
ssl_cert_file = "#{get_apache2_ssl_cert_file}"
|
106
106
|
ssl_cert_filename = Pathname.new(ssl_cert_file).basename
|
107
107
|
info "Copying certificate (#{ssl_cert_file}) to cert directory..."
|
108
108
|
sudo :rm, "-rf", "#{ssl_cert_dir}/#{ssl_cert_filename}"
|
109
109
|
sudo :cp, ssl_cert_file, ssl_cert_dir
|
110
110
|
sudo :chmod, '600', "#{ssl_cert_dir}/#{ssl_cert_filename}"
|
111
111
|
|
112
|
-
ssl_key_file = "#{
|
112
|
+
ssl_key_file = "#{get_apache2_ssl_key_file}"
|
113
113
|
ssl_key_filename = Pathname.new(ssl_key_file).basename
|
114
114
|
info "Copying certificate key (#{ssl_key_file}) to key directory..."
|
115
115
|
sudo :rm, '-rf', "#{ssl_private_dir}/#{ssl_key_filename}"
|
116
116
|
sudo :cp, ssl_key_file, ssl_private_dir
|
117
117
|
sudo :chmod, '600', "#{ssl_private_dir}/#{ssl_key_filename}"
|
118
118
|
|
119
|
-
ssl_chain_file = "#{
|
119
|
+
ssl_chain_file = "#{get_apache2_ssl_chain_file}"
|
120
120
|
ssl_chain_filename = Pathname.new(ssl_chain_file).basename
|
121
121
|
info "Copying certificate key (#{ssl_chain_file}) to cert directory..."
|
122
122
|
sudo :rm, '-rf', "#{ssl_cert_dir}/#{ssl_chain_filename}"
|
@@ -49,15 +49,15 @@
|
|
49
49
|
#
|
50
50
|
require 'tempfile'
|
51
51
|
require 'pathname'
|
52
|
-
|
52
|
+
|
53
53
|
namespace :psw_nginx do
|
54
54
|
|
55
55
|
#ssl cert properties
|
56
|
-
def
|
56
|
+
def get_nginx_ssl_cert_file
|
57
57
|
fetch(:psw_nginx_ssl_cert_file, "")
|
58
58
|
end
|
59
59
|
|
60
|
-
def
|
60
|
+
def get_nginx_ssl_key_file
|
61
61
|
fetch(:psw_nginx_ssl_key_file, "")
|
62
62
|
end
|
63
63
|
|
@@ -84,14 +84,14 @@ namespace :psw_nginx do
|
|
84
84
|
info "Creating cert key directory..."
|
85
85
|
sudo :mkdir, '-p', ssl_private_dir
|
86
86
|
|
87
|
-
ssl_cert_file = "#{
|
87
|
+
ssl_cert_file = "#{get_nginx_ssl_cert_file}"
|
88
88
|
ssl_cert_filename = Pathname.new(ssl_cert_file).basename
|
89
89
|
info "Copying certificate (#{ssl_cert_file}) to key directory..."
|
90
90
|
sudo :rm, "-rf", "#{ssl_cert_dir}/#{ssl_cert_filename}"
|
91
91
|
sudo :cp, ssl_cert_file, ssl_cert_dir
|
92
92
|
sudo :chmod, '600', "#{ssl_cert_dir}/#{ssl_cert_filename}"
|
93
93
|
|
94
|
-
ssl_key_file = "#{
|
94
|
+
ssl_key_file = "#{get_nginx_ssl_key_file}"
|
95
95
|
ssl_key_filename = Pathname.new(ssl_key_file).basename
|
96
96
|
info "Copying certificate key (#{ssl_key_file}) to key directory..."
|
97
97
|
sudo :rm, '-rf', "#{ssl_private_dir}/#{ssl_key_filename}"
|