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

Use apache mod classes #516

Merged
merged 1 commit into from Jul 28, 2017
Merged

Use apache mod classes #516

merged 1 commit into from Jul 28, 2017

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Jan 6, 2017

@ekohl
Copy link
Member Author

ekohl commented May 19, 2017

The pl-apache PR has been merged and rebased. Do we want to wait for a pl-apache release though?

@ekohl ekohl changed the title [WIP] Use apache mod classes Use apache mod classes May 19, 2017
Copy link
Contributor

@domcleal domcleal left a comment

Choose a reason for hiding this comment

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

I think it'll need to wait for the next apache release, then increase the metadata.json dep.

@@ -95,6 +95,13 @@
include ::apache::mod::headers
include ::apache::mod::passenger

if $::foreman::ipa_authentication {
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be added to the local class parameters list so it can be set in foreman::config::passenger tests.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated with tests

@@ -314,6 +319,41 @@
should contain_apache__vhost('foreman-ssl').with_passenger_pre_start("https://#{facts[:fqdn]}:8443")
end
end

describe 'with different ports set' do
Copy link
Contributor

Choose a reason for hiding this comment

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

with ipa_authentication => true ?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's still early. Fixed

Copy link
Contributor

@domcleal domcleal left a comment

Choose a reason for hiding this comment

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

Subject to dep on puppetlabs-apache being increased on release.

Requires puppetlabs-apache 7301123aa51afe696f129988482889f61aa4f0d0
which is shipped since 2.0.0 so we bump the required version.

[1] puppetlabs/puppetlabs-apache@7301123
@ekohl
Copy link
Member Author

ekohl commented Jul 26, 2017

Rebased now that puppetlabs-apache 2.0.0 is out.

@mmoll mmoll merged commit 8075727 into theforeman:master Jul 28, 2017
@mmoll
Copy link
Contributor

mmoll commented Jul 28, 2017

merged, bedankt @ekohl!

@ekohl ekohl deleted the apache-mods branch August 18, 2017 14:14
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

3 participants