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.

Sign up for GitHub

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

Adding support for Scientific Linux #69

Merged
merged 1 commit into from
Apr 22, 2015
Merged

Adding support for Scientific Linux #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
3 changes: 1 addition & 2 deletions templates/etc/httpd/conf.d/05-foreman.d/katello.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Alias /pub /var/www/html/pub
<Location /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
Expand All @@ -21,4 +21,3 @@ Include /etc/pulp/vhosts80/*.conf
PassengerEnabled off
Options +FollowSymLinks +Indexes
</Location>