capistrano-demonz 0.0.24 → 0.0.26

data/CHANGELOG.md

@@ -1,6 +1,12 @@
-**Current version:** 0.0.24
+**Current version:** 0.0.26
 
 ## Changes ##
+### 0.0.26 ###
+* Fixes mixup between file and directory permissions.
+
+### 0.0.25 ###
+* Further fixing of group permissions.
+
 ### 0.0.24 ###
 * Makes sure the settings file is owned by the correct user after copying it.
 * Sets proper group permissions on files/directories now.

data/lib/demonz/base.rb

@@ -169,9 +169,13 @@ configuration.load do
 
     desc "Set standard permissions for Demonz servers"
     task :fixperms, :roles => :web, :except => { :no_release => true } do
+      group_writable = fetch(:group_writable, true)
+      dir_permissions = group_writable ? 775 : 755;
+      file_permissions = group_writable ? 664 : 644;
+
       # chmod the files and directories.
-      set_perms_dirs("#{latest_release}")
-      set_perms_files("#{latest_release}")
+      set_perms_dirs("#{latest_release}", dir_permissions)
+      set_perms_files("#{latest_release}", file_permissions)
     end
 
     desc "Test: Task used to verify Capistrano is working. Prints operating system name."
@@ -426,8 +430,8 @@ configuration.load do
         # SET/RESET PERMISSIONS
         # --------------------------
         group_writable = fetch(:group_writable, true)
-        file_permissions = group_writable ? 775 : 755;
-        dir_permissions = group_writable ? 664 : 644;
+        dir_permissions = group_writable ? 775 : 755;
+        file_permissions = group_writable ? 664 : 644;
 
         set_perms_dirs("#{tmp_backups_path}/#{release_name}", file_permissions)
         set_perms_files("#{tmp_backups_path}/#{release_name}", dir_permissions)
@@ -482,8 +486,8 @@ configuration.load do
 
         # fix permissions on the the files and directories before removing them
         group_writable = fetch(:group_writable, true)
-        file_permissions = group_writable ? 775 : 755;
-        dir_permissions = group_writable ? 664 : 644;
+        dir_permissions = group_writable ? 775 : 755;
+        file_permissions = group_writable ? 664 : 644;
 
         archives.split(" ").each do |backup|
           set_perms_dirs("#{backup}", dir_permissions)

data/lib/demonz/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Demonz
-    VERSION = "0.0.24"
+    VERSION = "0.0.26"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-demonz
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors: