Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

never deploy /pub, that's handled by f_p_c now #362

Merged
merged 1 commit into from
Oct 2, 2020
Merged

never deploy /pub, that's handled by f_p_c now #362

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
8 changes: 2 additions & 6 deletions manifests/pulp.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@
# @param yum_max_speed
# The maximum download speed per second for a Pulp task, such as a sync. (e.g. "4 Kb" (Uses SI KB), 4MB, or 1GB" )
#
# @param pub_dir_options
# The Apache options to use on the `/pub` resource
#
# @param manage_vhost_standalone
# Boolean to manage the Pulp vhost standalone. Otherwise the vhost is managed as part of Foreman
#
Expand Down Expand Up @@ -92,7 +89,6 @@
Boolean $mongodb_unsafe_autoretry = false,
Optional[Enum['majority', 'all']] $mongodb_write_concern = undef,
Boolean $manage_mongodb = true,
String $pub_dir_options = '+FollowSymLinks +Indexes',
Boolean $manage_vhost_standalone = false,
Optional[Stdlib::Absolutepath] $https_cert = undef,
Optional[Stdlib::Absolutepath] $https_key = undef,
Expand All @@ -111,12 +107,12 @@
if $manage_vhost_standalone {
$server_name = undef

concat::fragment { 'httpd_pub':
concat::fragment { 'httpd_pulp':
target => '05-pulp-http.conf',
content => template('katello/pulp-apache.conf.erb'),
}

pulp::apache::fragment { 'httpd_ssl_pub':
pulp::apache::fragment { 'httpd_ssl_pulp':
ssl_content => template('katello/pulp-apache-ssl.conf.erb'),
}
} else {
Expand Down
8 changes: 0 additions & 8 deletions templates/pulp-apache-ssl.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
SSLUsername SSL_CLIENT_S_DN_CN
</Location>

Alias /pub /var/www/html/pub
<Location /pub>
<IfModule mod_passenger.c>
PassengerEnabled off
</IfModule>
Options <%= @pub_dir_options %>
</Location>

#support cert auth for registry url
<Location /v2/>
RequestHeader set SSL_CLIENT_I_DN "%{SSL_CLIENT_I_DN}s"
Expand Down
10 changes: 0 additions & 10 deletions templates/pulp-apache.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
### File managed with puppet ###

Alias /pub /var/www/html/pub

<Location /pub>
<IfModule mod_passenger.c>
PassengerEnabled off
</IfModule>
Options <%= @pub_dir_options %>
Require all granted
</Location>

Include <%= scope['apache::confd_dir'] %>/pulp-vhosts80/*.conf

<Location /pulp>
Expand Down