mirror_php/deployer
1
0
Fork 0
mirror of https://github.com/deployphp/deployer.git synced 2025-02-24 01:02:24 +01:00
Code Issues Projects Releases Wiki Activity

moving the name column to the last position to show full name (#1580)

Browse Source 
* moving the name column to the last position to show full name

- bug fix: #1579

* add changelog

* update changelog.md

* update CHANGELOG.md

* modify command to find http user

* modify command to find http user
This commit is contained in:
Ryan Park 2018-04-18 13:22:03 +09:00 committed by Anton Medvedev
parent 467969b3fe
commit 96f5edaebe
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -3,9 +3,12 @@
## master
[v6.1.0...master](https://github.com/deployphp/deployer/compare/v6.1.0...master)
### Fixed
### Added
- Added cache clear/warmup task for symfony4 recipe [#1575]
### Fixed
- Fixed that long http user name is not detected correctly [#1580]
## v6.1.0
[v6.0.5...v6.1.0](https://github.com/deployphp/deployer/compare/v6.0.5...v6.1.0)
@ -363,7 +366,7 @@
- Fixed remove of shared dir on first deploy
[#1580]: https://github.com/deployphp/deployer/pull/1580
[#1575]: https://github.com/deployphp/deployer/pull/1575
[#1559]: https://github.com/deployphp/deployer/pull/1559
[#1557]: https://github.com/deployphp/deployer/pull/1557

2
recipe/deploy/writable.php
View File

@ -24,7 +24,7 @@ task('deploy:writable', function () {
if ($httpUser === false && $mode !== 'chmod') {
// Detect http user in process list.
$httpUser = run("ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d ' ' -f1");
$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}'");
if (empty($httpUser)) {
throw new \RuntimeException(