Skip to content

Commit

Permalink
Use apache mod classes
Browse files Browse the repository at this point in the history
  • Loading branch information
ekohl committed Jan 6, 2017
1 parent 25dda60 commit a3c0017
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
7 changes: 7 additions & 0 deletions manifests/config/passenger.pp
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@
include ::apache::mod::headers
include ::apache::mod::passenger

if $::foreman::ipa_authentication {
include ::apache::mod::authnz_pam
include ::apache::mod::intercept_form_submit
include ::apache::mod::lookup_identity
include ::apache::mod::auth_kerb
}

if $use_vhost {
# Check the value in case the interface doesn't exist, otherwise listen on all interfaces
if $listen_on_interface and $listen_on_interface in split($::interfaces, ',') {
Expand Down
21 changes: 3 additions & 18 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,9 @@
}
}

if $::foreman::ipa_authentication {
case $::osfamily {
'RedHat': {
# The apache::mod's need to be in install to break circular dependencies
::apache::mod { 'authnz_pam': package => 'mod_authnz_pam' }
::apache::mod { 'intercept_form_submit': package => 'mod_intercept_form_submit' }
::apache::mod { 'lookup_identity': package => 'mod_lookup_identity' }
include ::apache::mod::auth_kerb
}
default: {
fail("${::hostname}: ipa_authentication is not supported on osfamily ${::osfamily}")
}
}

if $::foreman::ipa_manage_sssd {
package { 'sssd-dbus':
ensure => installed,
}
if $::foreman::ipa_authentication and $::foreman::ipa_manage_sssd {
package { 'sssd-dbus':
ensure => installed,
}
}
}

0 comments on commit a3c0017

Please sign in to comment.