[deploy:writable] chgrp doesn't need http_user (#1660)

* deploy:writable: chgrp doesn't need http_user * Update CHANGELOG.md
deployphp · Jul 27, 2018 · f770695 · f770695
1 parent 62002e7
commit f770695
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Allow to set template file path in Drupal 7 recipe [#1603]
 - Fixed once() tasks that where being run multiple times with ParallelExecutor
 - Fixed high CPU usage when running in parallel
+- Fixed `deploy:writable` no need to specify http_user when using chgrp writable_mode
 
 ## v6.1.0
 [v6.0.5...v6.1.0](https://github.com/deployphp/deployer/compare/v6.0.5...v6.1.0)

diff --git a/recipe/deploy/writable.php b/recipe/deploy/writable.php
@@ -22,7 +22,7 @@
         return;
     }
 
-    if ($httpUser === false && $mode !== 'chmod') {
+    if ($httpUser === false && ! in_array($mode, ['chgrp', 'chmod'], true)) {
         // Detect http user in process list.
         $httpUser = run("ps axo comm,user | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | awk '{print $2}'");