Remove pulp_webserver_static_dir

fixes #6601 https://pulp.plan.io/issues/6601
pulp · Apr 30, 2020 · add6a7f · add6a7f
1 parent 126a739
commit add6a7f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/CHANGES/6601.removal b/CHANGES/6601.removal
@@ -0,0 +1,2 @@
+Removed the pulp_webserver_static_dir option.
+This fixes a bug where installations served content they should not.
diff --git a/roles/pulp-webserver/README.md b/roles/pulp-webserver/README.md
@@ -22,8 +22,6 @@ Variables:
   '127.0.0.1'.
 * `pulp_configure_firewall` Install and configure a firewall. Valid values are 'auto', 'firewalld',
   and 'none'. Defaults to 'auto' (which is the same as 'firewalld', but may change in the future).
-* `pulp_webserver_static_dir` equivalent to `STATIC_ROOT` from `pulpcore` i.e. absolute path where to find
-  static files.
 
 Plugin Webserver Configs:
 -------------------------

diff --git a/roles/pulp-webserver/defaults/main.yml b/roles/pulp-webserver/defaults/main.yml
@@ -6,4 +6,3 @@ pulp_api_host: 127.0.0.1
 pulp_api_port: 24817
 pulp_configure_firewall: auto
 pulp_user_home: '/var/lib/pulp'
-pulp_webserver_static_dir: "{{ pulp_user_home | regex_replace('\\/$', '') }}/assets/"
diff --git a/roles/pulp-webserver/templates/nginx.conf.j2 b/roles/pulp-webserver/templates/nginx.conf.j2
@@ -42,9 +42,6 @@ http {
         # Gunicorn docs suggest this value.
         keepalive_timeout 5;
 
-        # Path to Pulp's static files.
-        root {{ pulp_webserver_static_dir }};
-
         location /pulp/content/ {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;

diff --git a/roles/pulp-webserver/templates/pulp-vhost.conf.j2 b/roles/pulp-webserver/templates/pulp-vhost.conf.j2
@@ -4,15 +4,6 @@ Define pulp-api {{ pulp_api_host }}:{{ pulp_api_port }}
 <VirtualHost *:80>
   ServerName {{ ansible_nodename }}
 
-  ## Vhost docroot
-  DocumentRoot {{ pulp_webserver_static_dir }}
-
-  <Directory "{{ pulp_webserver_static_dir }}">
-    Options SymLinksIfOwnerMatch
-    AllowOverride None
-    Require all granted
-  </Directory>
-
   ## Logging
   ErrorLog "{{ pulp_webserver_apache_log_dir }}/pulp_error.log"
   ServerSignature Off