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

theforeman · Oct 2, 2020 · 45b5dc3 · 45b5dc3
1 parent 7200bf3
commit 45b5dc3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/manifests/pulp.pp b/manifests/pulp.pp
@@ -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
 #
@@ -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,
@@ -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 {

diff --git a/templates/pulp-apache-ssl.conf.erb b/templates/pulp-apache-ssl.conf.erb
@@ -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"

diff --git a/templates/pulp-apache.conf.erb b/templates/pulp-apache.conf.erb
@@ -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>