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

SSLProtocol, SSLCipherSuite, SSLHonorCipherOrder support in the SSL section #378

Merged
merged 4 commits into from
Oct 1, 2013

Conversation

AlexRRR
Copy link
Contributor

@AlexRRR AlexRRR commented Sep 25, 2013

Single commit for #354. closes #371

Here you go.

@kisst
Copy link

kisst commented Sep 25, 2013

Thanks for that, I will buy an "git for dummies" book to be able to do it just myself next time.

@blewa
Copy link
Contributor

blewa commented Sep 25, 2013

I'll throw in a new PR for the other options that got smashed into the other PR after this one has been merged in (sorry for the confusion there). GitHub seems to automatically merge them in if it's based on a branch where you've made a pull request.

<% if @ssl_protocol -%>
SSLProtocol <%= @ssl_protocol %>
<% end -%>
<% if @ssl_chiper -%>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: spelled chiper instead of cipher

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @paul91

<% end -%>
<% if @ssl_cipher -%>
SSLCipherSuite <%= @ssl_cipher %>
<% end -%>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you're at it, might I also suggest adding support for SSLHonorCipherOrder

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@igalic Good Idea. Thanks.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, but do not forget about the documentation, put this option into the README.md as well

blkperl added a commit that referenced this pull request Oct 1, 2013
SSLProtocol, SSLCipherSuite, SSLHonorCipherOrder support in the SSL section
@blkperl blkperl merged commit b92a1d6 into puppetlabs:master Oct 1, 2013
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
…petlabs#378'

The fix done in 2018 was not complete. There were five more code lines which inserted the optional parameters at the wrong position.
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
Fixing the fix 'Fix the docker_compose options parameter position puppetlabs#378'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants