Support for Drupal 7 is ending on 5 January 2025—it’s time to migrate to Drupal 10! Learn about the many benefits of Drupal 10 and find migration tools in our resource center.The Apache service allows different restart commands to be used, whereas the nginx one does not. It should. I'll do the code change on Friday at the sprint.
| Comment | File | Size | Author |
|---|---|---|---|
| #12 | nginx-optional-commands-1259098.patch | 691 bytes | realityloop |
| #7 | nginx-optional-commands-1259098.patch | 989 bytes | realityloop |
| #5 | nginx-optional-commands-1259098.patch | 989 bytes | realityloop |
Comments
Comment #1
realityloopHere is the command for OS X where nginx was installed using homebrew:
/usr/local/sbin/nginx -s reload
Comment #2
realityloopHi Steve,
I've written the code for this, which branch should I create the patch against?
Comment #3
Steven Jones CreditAttribution: Steven Jones commentedAgainst the 7.x-2.x would be best, and we'll just cherry-pick it back into the 6.x-1.x branch anyway.
Comment #4
Steven Jones CreditAttribution: Steven Jones commentedComment #5
realityloopPatch against 7.x attached
Comment #6
realityloopforgot to change status
Comment #7
realityloopUpdated quotes on anarcat's suggestion
Comment #8
omega8cc CreditAttribution: omega8cc commentedThis patch breaks my install, debugging now.
Comment #9
omega8cc CreditAttribution: omega8cc commentedThis patch fixes the issue for me, because it lists the default command as first (default) and not last, which matches the c.a.o how-to for sudoers entry.
http://drupalcode.org/sandbox/omega8cc/1111100.git/commit/5aa3e49
[EDIT] The problem with original patch was because it matched also non-init.d versions/locations, which didn't match default sudoers entry. This is also a docs candidate.
Comment #10
anarcat CreditAttribution: anarcat commentedpushed to 2.x, waiting for jenkins.
Comment #11
anarcat CreditAttribution: anarcat commentedmerged, part of 1.3!
Comment #12
realityloopUnfortunately the merged patch doesn't work with non unix systems, this updated patch resolves the issue
Comment #13
omega8cc CreditAttribution: omega8cc commentedI'm not sure I understand this patch.
Could you provide more detailed feedback/debugging info?
If there is no
/etc/init.d/nginxon your server, it should just work and the patch doesn't make any difference, imo.What is the path to the Nginx binary on your system and what is the entry in your /etc/sudoers?
Comment #14
Deciphered CreditAttribution: Deciphered commented@omega8cc,
The patch is for installing Aegir on OS X, with Nginx installed via Homebrew. There is no /etc/init.d on a mac.
Comment #15
omega8cc CreditAttribution: omega8cc commented@Deciphered, I know, but it doesn't answer my questions. The way the patch is trying to fix the issue doesn't look like a fix, but rather workaround, so we need to learn what exactly the problem is and fix it properly to avoid introducing issues for other systems (as we did for OS X).
Comment #16
Steven Jones CreditAttribution: Steven Jones commented@realityloop/Deciphered the patch in #12 doesn't seem to change all that much, does that actually resolve the issue for you? If it does, do you know why?
I agree with omega8cc that we should avoid hacks for specific systems if we can, but it seems that here we can with very little effort make things work with osx, in a nice general way.
Comment #17
omega8cc CreditAttribution: omega8cc commentedThis (untested) patch should fix the issue: http://drupalcode.org/sandbox/omega8cc/1111100.git/commit/a208ed4
Comment #18
omega8cc CreditAttribution: omega8cc commentedWe need also this patch: http://drupalcode.org/sandbox/omega8cc/1111100.git/commit/78c8c16
Comment #19
Deciphered CreditAttribution: Deciphered commentedI agree, the patch doesn't seem to do anything at all except change the namespace. I'll put it down to Realityloop's DrupalCon Flu ;)
Will test out those other patches shortly, thanks omega8cc.
Comment #20
Deciphered CreditAttribution: Deciphered commentedPatch at #17 seems to do the job.
For sanity sake/smaller code, and maybe due to laziness as I had already applied this seemingly do-nothing patch, I changed the condition in patch #17 to be
($test == $default).Didn't apply #18 because the original didn't seem to be present to be patched.
Unfortunately while the primary issue of Nginx not being reloaded has been resolved by this issue, I am still having problems with other sections, but won't post those issues here as I'd like to at least get this one issue resolved.
Comment #21
Deciphered CreditAttribution: Deciphered commentedOops, didn't mean to change status.
Comment #22
Steven Jones CreditAttribution: Steven Jones commentedI've pushed #17 into 6.x-1.x, but not #18, as that seems to depend on other changes not in 6.x-1.x?
Comment #23
omega8cc CreditAttribution: omega8cc commentedRight, #18 is safe to skip for now, as we have already rewritten that code in the meantime anyway, while #17 should work fine.
Now I need to submit a patch for 2.x, I guess, so I'm changing the version.
Comment #24
omega8cc CreditAttribution: omega8cc commentedPatch to be ported.
Comment #25
omega8cc CreditAttribution: omega8cc commentedFixed in commit: http://drupalcode.org/project/provision.git/commit/569d5489b7e40bb55981d...
Comment #27
anarcat CreditAttribution: anarcat commented