Add writable_acl_force to force ACL reset on writable dirs

.gitignore

@@ -3,3 +3,4 @@
 .phpunit.result.cache
 docker-compose.override.yml
 .php-cs-fixer.cache
+.idea/

docs/recipe/deploy/writable.md

@@ -98,11 +98,21 @@ List of additional groups to give write permission to.
 
 
 
+### writable_acl_force
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/deploy/writable.php#L65)
+
+Force setting ACLs even when writable dirs already have them.
+
+```php title="Default value"
+false
+```
+
+
 
 ## Tasks
 
 ### deploy\:writable {#deploy-writable}
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/deploy/writable.php#L65)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/deploy/writable.php#L68)
 
 Makes writable dirs.
 

recipe/deploy/writable.php

@@ -61,6 +61,9 @@
 // List of additional groups to give write permission to.
 set('writable_acl_groups', []);
 
+// Force setting ACLs even when writable dirs already have them.
+set('writable_acl_force', false);
+
 desc('Makes writable dirs');
 task('deploy:writable', function () {
     $dirs = join(' ', get('writable_dirs'));
@@ -121,14 +124,16 @@
             if (empty($sudo)) {
                 // When running without sudo, exception may be thrown
                 // if executing setfacl on files created by http user (in directory that has been setfacl before).
-                // These directories/files should be skipped.
-                // Now, we will check each directory for ACL and only setfacl for which has not been set before.
+                // These directories/files should be skipped unless forcing ACL reset.
+                // Now, we will check each directory for ACL and only setfacl for which has not been set before,
+                // unless writable_acl_force is enabled.
                 $writeableDirs = get('writable_dirs');
+                $forceAcl = get('writable_acl_force');
                 foreach ($writeableDirs as $dir) {
                     // Check if ACL has been set or not
                     $hasfacl = run("getfacl -p $dir | grep \"^user:$httpUser:.*w\" | wc -l");
-                    // Set ACL for directory if it has not been set before
-                    if (!$hasfacl) {
+                    // Set ACL for directory if it has not been set before or if forcing ACL reset
+                    if ($forceAcl || !$hasfacl) {
                         run("setfacl -L $recursive $setFaclUsers $setFaclGroups $dir");
                         run("setfacl -dL $recursive $setFaclUsers $setFaclGroups $dir");
                     }