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.

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

[apache] Added collection of conf.modules.d dir for httpd 2.4 #466

Closed
wants to merge 1 commit into from
Closed

Conversation

csutherl
Copy link
Contributor

I am submitting this pull request so that sosreport will collect all of the configuration for httpd 2.4 instead of the previous versions conf and conf.d directories. httpd 2.4 utilizes a new config directory (conf.modules.d) to init modules that are loaded into the server.

I wasn't sure if you guys preferred an issue to be logged for this for tracking purposes first, but if I should add one, comment and I will and amend my commit to address it.

Signed-off-by: Coty Sutherland sutherland.coty@gmail.com

@csutherl
Copy link
Contributor Author

I went ahead and opened a BZ to try and get this into RHEL 7 as well: https://bugzilla.redhat.com/show_bug.cgi?id=1183266

@csutherl
Copy link
Contributor Author

csutherl commented Feb 6, 2015

I didn't think about this before, but if you want I can squash that last commit and amend the first one to include the comma. That way there is only one commit in the PR. Just let me know.

@pmoravec
Copy link
Contributor

Ack from my side.

@adam-stokes
Copy link

@csutherl That would be preferable to squash the commit so as to keep the history pretty clean. ACK from me otherwise

Thanks!

@adam-stokes
Copy link

@csutherl waiting on squash commit so we can merge this up.

Signed-off-by: Coty Sutherland <sutherland.coty@gmail.com>
@csutherl
Copy link
Contributor Author

@battlemidget sorry about that wait; I feel like I missed this up though...should I just trash my fork, refork, and then push my commit so I don't have to include the merge commit?

@bmr-cymru
Copy link
Member

No - just fix your branch (e.g. using git rebase -i) and then force-update the GitHub copy by running git push --force. This will update the PR with the new changes & keeps all the GitHub pull / issue accounting in order.

@csutherl
Copy link
Contributor Author

@bmr-cymru done, thanks for the tip. Let me know if there is anything else required for this.

@adam-stokes
Copy link

ack, ill merge once travis is done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants