capistrano-psw 1.0.0.pre26 → 1.0.0.pre27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/capistrano/psw/version.rb +1 -1
- data/resources/lib/capistrano/tasks/psw-apache2.cap +14 -5
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1314039831c1a334a8164ba5c7f1dc7bffc633c0
|
|
4
|
+
data.tar.gz: cd56425e874886b04302a9c97eb5ee0a33dc68fc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 94ca83ac39dccd9d712f25ad7f8b7ea40694f7ca19c61bba8bc33efd992850a63f094fc4ea49d0da47e25034ae582829e9b02c502040196da52c0641d6f7fbde
|
|
7
|
+
data.tar.gz: 48053bdf646775619d9324ccb098813af3b3b9179e56196c611f25b432c797d5ae0ac6bde1406d0ebd7e5ee49da155fa4e857c71767a28d53f1fc8aeb4d35bfd
|
|
@@ -175,7 +175,7 @@ namespace :psw_apache2 do
|
|
|
175
175
|
peppr_current_location=$1
|
|
176
176
|
if [ -z "$peppr_current_location" ]; then
|
|
177
177
|
echo "Peppr current location not specified!"
|
|
178
|
-
exit
|
|
178
|
+
exit 1
|
|
179
179
|
fi
|
|
180
180
|
echo "Current peppr location: $peppr_current_location"
|
|
181
181
|
|
|
@@ -192,7 +192,7 @@ namespace :psw_apache2 do
|
|
|
192
192
|
apache_config_location=$($apache_service_name -V | grep -i " -D HTTPD_ROOT=")
|
|
193
193
|
if [ -z "$apache_config_location" ]; then
|
|
194
194
|
echo "No apache configuration location has been defined!"
|
|
195
|
-
exit
|
|
195
|
+
exit 1
|
|
196
196
|
fi
|
|
197
197
|
apache_config_location=${apache_config_location:16}
|
|
198
198
|
apache_config_location=${apache_config_location%?}
|
|
@@ -201,7 +201,7 @@ namespace :psw_apache2 do
|
|
|
201
201
|
apache_config_file==$($apache_service_name -V | grep -i " -D SERVER_CONFIG_FILE=")
|
|
202
202
|
if [ -z "$apache_config_location" ]; then
|
|
203
203
|
echo "No apache configuration file has been defined!"
|
|
204
|
-
exit
|
|
204
|
+
exit 1
|
|
205
205
|
fi
|
|
206
206
|
apache_config_file=${apache_config_file:25}
|
|
207
207
|
apache_config_file=${apache_config_file%?}
|
|
@@ -211,7 +211,7 @@ namespace :psw_apache2 do
|
|
|
211
211
|
apache_docroot_dir=$(grep -i 'DocumentRoot ' $apache_config_file_location)
|
|
212
212
|
if [ -z "$apache_docroot_dir" ]; then
|
|
213
213
|
echo "Unable to find apache's DocumentRoot!"
|
|
214
|
-
exit
|
|
214
|
+
exit 1
|
|
215
215
|
fi
|
|
216
216
|
apache_docroot_dir=${apache_docroot_dir:14}
|
|
217
217
|
apache_docroot_dir=${apache_docroot_dir%?}
|
|
@@ -223,11 +223,20 @@ namespace :psw_apache2 do
|
|
|
223
223
|
echo "Creating link $peppr_docroot to directory $peppr_current_location..."
|
|
224
224
|
echo "Executing: sudo ln -nsf $peppr_current_location $peppr_docroot"
|
|
225
225
|
result=$(sudo rm -rf $peppr_docroot)
|
|
226
|
+
if [[ $result != 0 ]] ; then
|
|
227
|
+
echo "Failed to remove current document root!"
|
|
228
|
+
exit 1
|
|
229
|
+
fi
|
|
230
|
+
|
|
226
231
|
result=$(sudo ln -nsf $peppr_current_location $peppr_docroot)
|
|
232
|
+
if [[ $result != 0 ]] ; then
|
|
233
|
+
echo "Failed to create a symbolic link to new document root!"
|
|
234
|
+
exit 1
|
|
235
|
+
fi
|
|
227
236
|
|
|
228
237
|
link_listing=$(ls -la $peppr_docroot)
|
|
229
238
|
echo "Resulting Link: $link_listing"
|
|
230
|
-
echo "Script completed!"
|
|
239
|
+
echo "Script completed!"
|
|
231
240
|
eos
|
|
232
241
|
|
|
233
242
|
local_script_dir= PepprAppDeployFileUtils::Local::get_deployment_scripts_dir
|