Set STATIC_ROOT in settings.py

By setting it in settings.py, pulp-manager will also know about it. It also makes the service file more straight forward.
theforeman · Sep 14, 2020 · ae470e0 · ae470e0
1 parent 7098cea
commit ae470e0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/spec/classes/pulpcore_spec.rb b/spec/classes/pulpcore_spec.rb
@@ -254,11 +254,11 @@
           is_expected.to compile.with_all_deps
           is_expected.to contain_file('/my/custom/directory')
           is_expected.to contain_systemd__unit_file('pulpcore-api.service')
-            .with_content(%r{Environment="PULP_STATIC_ROOT=/my/other/custom/directory"})
           is_expected.to contain_apache__vhost('pulpcore')
             .with_docroot('/my/custom/directory')
           is_expected.to contain_concat__fragment('base')
             .with_content(%r{MEDIA_ROOT = "/my/custom/directory"})
+            .with_content(%r{STATIC_ROOT = "/my/other/custom/directory"})
         end
       end
     end

diff --git a/templates/pulpcore-api.service.erb b/templates/pulpcore-api.service.erb
@@ -6,7 +6,6 @@ Wants=network-online.target
 [Service]
 Environment="DJANGO_SETTINGS_MODULE=pulpcore.app.settings"
 Environment="PULP_SETTINGS=<%= scope['pulpcore::settings_file'] %>"
-Environment="PULP_STATIC_ROOT=<%= scope['pulpcore::pulp_static_root'] %>"
 User=<%= scope['pulpcore::user'] %>
 PIDFile=/run/pulpcore-api.pid
 RuntimeDirectory=pulpcore-api

diff --git a/templates/settings.py.erb b/templates/settings.py.erb
@@ -20,6 +20,7 @@ DATABASES = {
     },
 }
 MEDIA_ROOT = "<%= scope['pulpcore::webserver_static_dir'] %>"
+STATIC_ROOT = "<%= scope['pulpcore::pulp_static_root'] %>"
 REDIS_HOST = "localhost"
 REDIS_PORT = "<%= scope['redis::port'] %>"
 REDIS_DB = <%= scope['pulpcore::redis_db'] %>