move media/static root variables inside dict CREDENTIALS_FILE_STORAGE_BACKEND

playbooks/roles/credentials/defaults/main.yml

@@ -104,14 +104,20 @@ CREDENTIALS_USER_API_JWT_SECRET_KEY: 'lms-secret'
 #    Cache-Control: max-age-31536000
 #    Access-Control-Allow-Origin: 'PUT-YOUR-HOSTNAME-HERE'
 #
-#  COMPRESS_URL: 'https://mybucket.s3.amazonaws.com/staticfiles/'
-#  STATIC_URL: 'https://mybucket.s3.amazonaws.com/staticfiles/'
+#  STATIC_ROOT: 'static'
+#  STATIC_URL: 'https://mybucket.s3.amazonaws.com/static/'
+#  COMPRESS_URL: 'https://mybucket.s3.amazonaws.com/static/'
+#  MEDIA_ROOT: 'media'
 #  MEDIA_URL: 'https://mybucket.s3.amazonaws.com/media/'
 #  COMPRESS_STORAGE: 'credentials.apps.core.s3utils.StaticS3BotoStorage'
 #  STATICFILES_STORAGE: 'credentials.apps.core.s3utils.StaticS3BotoStorage'
-#  DEFAULT_FILE_STORAGE: 'credentials.apps.core.s3utils.MediaRootS3BotoStorage'
+#  DEFAULT_FILE_STORAGE: 'credentials.apps.core.s3utils.MediaS3BotoStorage'
 
 CREDENTIALS_FILE_STORAGE_BACKEND:
+  MEDIA_ROOT: '{{ CREDENTIALS_MEDIA_ROOT }}'
+  MEDIA_URL: '{{ CREDENTIALS_MEDIA_URL }}'
+  STATIC_ROOT: '{{ CREDENTIALS_STATIC_ROOT }}'
+  STATIC_URL: '{{ CREDENTIALS_STATIC_URL }}'
   DEFAULT_FILE_STORAGE: 'django.core.files.storage.DefaultStorage'
 
 CREDENTIALS_SERVICE_CONFIG:
@@ -126,11 +132,6 @@ CREDENTIALS_SERVICE_CONFIG:
   SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ CREDENTIALS_OAUTH_URL_ROOT }}/oauth2'
   SOCIAL_AUTH_REDIRECT_IS_HTTPS: '{{ CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS }}'
 
-  MEDIA_ROOT: '{{ CREDENTIALS_MEDIA_ROOT }}'
-  MEDIA_URL: '{{ CREDENTIALS_MEDIA_URL }}'
-  STATIC_ROOT: '{{ CREDENTIALS_STATIC_ROOT }}'
-  STATIC_URL: '{{ CREDENTIALS_STATIC_URL }}'
-
   # db config
   DATABASE_OPTIONS:
     connect_timeout: 10