diff --git a/.fixtures.yml b/.fixtures.yml index e02afa7d..aebbe40b 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -5,7 +5,9 @@ fixtures: postgresql: "git://github.com/puppetlabs/puppetlabs-postgresql.git" mongodb: "git://github.com/puppetlabs/puppetlabs-mongodb.git" foreman: "git://github.com/theforeman/puppet-foreman.git" - concat: "git://github.com/puppetlabs/puppetlabs-concat" + concat: + repo: "git://github.com/puppetlabs/puppetlabs-concat.git" + branch: "1.2.x" concat_native: "git://github.com/theforeman/puppet-concat" certs: "git://github.com/katello/puppet-certs.git" common: "git://github.com/katello/puppet-common.git" diff --git a/manifests/config.pp b/manifests/config.pp index 7e3e5677..69c4af92 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,6 +1,8 @@ # Katello Config class katello::config { + $apache_version = $::apache::apache_version + file { '/usr/share/foreman/bundler.d/katello.rb': ensure => file, owner => $katello::user, diff --git a/templates/etc/httpd/conf.d/05-foreman.d/katello.conf.erb b/templates/etc/httpd/conf.d/05-foreman.d/katello.conf.erb index 8d88acd8..e322c6b7 100644 --- a/templates/etc/httpd/conf.d/05-foreman.d/katello.conf.erb +++ b/templates/etc/httpd/conf.d/05-foreman.d/katello.conf.erb @@ -8,7 +8,7 @@ Alias /pub /var/www/html/pub PassengerEnabled off Options +FollowSymLinks +Indexes -<% if ( @operatingsystem == "RedHat" && operatingsystemmajrelease == "7" ) -%> +<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> Require all granted <% else -%> Allow from all @@ -21,4 +21,3 @@ Include /etc/pulp/vhosts80/*.conf PassengerEnabled off Options +FollowSymLinks +Indexes -