capistrano-demonz 0.0.23 → 0.0.24

data/CHANGELOG.md

@@ -1,6 +1,10 @@
-**Current version:** 0.0.23
+**Current version:** 0.0.24
 
 ## Changes ##
+### 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.
+
 ### 0.0.23 ###
 * Fixes newline issue on rolling back the RELEASES file.
 

data/lib/demonz/base.rb

@@ -425,8 +425,12 @@ configuration.load do
         # --------------------------
         # SET/RESET PERMISSIONS
         # --------------------------
-        set_perms_dirs("#{tmp_backups_path}/#{release_name}", 755)
-        set_perms_files("#{tmp_backups_path}/#{release_name}", 644)
+        group_writable = fetch(:group_writable, true)
+        file_permissions = group_writable ? 775 : 755;
+        dir_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)
 
         # create the tarball of the previous release
         set :archive_name, "release_B4_#{release_name}.tar.gz"
@@ -477,9 +481,13 @@ configuration.load do
           File.join(backups_path, backup) }.join(" ")
 
         # 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;
+
         archives.split(" ").each do |backup|
-          set_perms_dirs("#{backup}", 755)
-          set_perms_files("#{backup}", 644)
+          set_perms_dirs("#{backup}", dir_permissions)
+          set_perms_files("#{backup}", file_permissions)
         end
 
         try_sudo "rm -rf #{archives}"

data/lib/demonz/drupal.rb

@@ -317,6 +317,9 @@ configuration.load do
         else
           logger.important "Failed to symlink the settings.php file in #{drupal_app_site_dir} because an unknown pattern was used"
       end
+
+      # Make sure the user owns it
+      run "#{try_sudo} chown -R #{user}:#{group} #{drupal_app_site_dir}/settings.php"
     end
 
     desc "Migrate old database to new release"
@@ -399,7 +402,7 @@ configuration.load do
 
         if !cleanup_releases.nil?
           files_backups = cleanup_releases.map { |release|
-            File.join(backups_path, "file_before_#{release}.tar.gz") }.join(" ")
+            File.join(backups_path, "files_before_#{release}.tar.gz") }.join(" ")
           try_sudo "rm -rf #{files_backups}"
         end
       end

data/lib/demonz/version.rb

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

metadata

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