Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Apr 18, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de22a1f
moving the name column to the last position to show full name
ryandev421 Apr 5, 2018
d435a89
add changelog
ryandev421 Apr 5, 2018
a9004d5
update changelog.md
ryandev421 Apr 5, 2018
34ee8fa
update CHANGELOG.md
ryandev421 Apr 5, 2018
d327a5d
modify command to find http user
Apr 6, 2018
73ba4cf
modify command to find http user
Apr 6, 2018
d0cbeb7
Merge branch 'master' into master
antonmedv Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion recipe/deploy/writable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

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(
Expand Down