Changing STATIC_URL

https://pulp.plan.io/issues/6128 ref #6128
pulp · Mar 13, 2020 · 7c63123 · 7c63123
1 parent c652e5e
commit 7c63123
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGES/6128.removal b/CHANGES/6128.removal
@@ -0,0 +1 @@
+Changing STATIC_URL
diff --git a/pulpcore/app/settings.py b/pulpcore/app/settings.py
@@ -29,7 +29,12 @@
 ALLOWED_HOSTS = ['*']
 
 MEDIA_ROOT = '/var/lib/pulp/'
-STATIC_ROOT = os.path.join(MEDIA_ROOT, 'assets/')
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.11/howto/static-files/
+
+STATIC_URL = '/assets/'
+STATIC_ROOT = os.path.join(MEDIA_ROOT, STATIC_URL.lstrip("/"))
 
 DEFAULT_FILE_STORAGE = 'pulpcore.app.models.storage.FileSystem'
 
@@ -162,11 +167,6 @@
 USE_TZ = True
 
 
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.11/howto/static-files/
-
-STATIC_URL = '/static/'
-
 # A set of default settings to use if the configuration file in
 # /etc/pulp/ is missing or if it does not have values for every setting