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

Finish SCL support for RHEL/CentOS 6 #821

Conversation

smerrill
Copy link
Contributor

This commit, along with #818 and #819, have allowed me to successfully use puppetlabs-apache to install and manage the httpd24 package from Software Collections on Red Hat 6.

I would like to let the current test suite pass, and then I know I owe a README update and some tests for the new $::apache::conf_dir parameter.

@puppetcla
Copy link

CLA signed by all contributors.

@blkperl
Copy link
Contributor

blkperl commented Aug 17, 2014

Looks good to me. Can you squash the 3 commits into 1 commit too?

@smerrill
Copy link
Contributor Author

I'll gladly squash it once the new tests pass. Does this look good now that the ::apache::conf_dir has a test and is in the README?

This is another change needed to make the httpd24 Software Collection
work on RHELish boxes.

Fix mod_systemd on RHEL/CentOS 6.

Puppet < 3.0 does not have unless.

Try another fix for Puppet 2.7 / Facter 1.7.

Add README and tests for ::apache::conf_dir.
@smerrill
Copy link
Contributor Author

(Squashed; the tests are still passing.)

underscorgan pushed a commit that referenced this pull request Aug 26, 2014
…-issues

Finish SCL support for RHEL/CentOS 6
@underscorgan underscorgan merged commit 7bd92bc into puppetlabs:master Aug 26, 2014
@underscorgan
Copy link
Contributor

Looks good, thanks @smerrill!

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.

None yet

5 participants