Commit 0b12c014 by zubair-arbi

add static and media files basic django configuration

ECOM-3694
parent 947eedfe
...@@ -54,6 +54,12 @@ CREDENTIALS_DJANGO_SETTINGS_MODULE: "credentials.settings.production" ...@@ -54,6 +54,12 @@ CREDENTIALS_DJANGO_SETTINGS_MODULE: "credentials.settings.production"
CREDENTIALS_URL_ROOT: 'http://credentials:18150' CREDENTIALS_URL_ROOT: 'http://credentials:18150'
CREDENTIALS_OAUTH_URL_ROOT: 'http://127.0.0.1:8000' CREDENTIALS_OAUTH_URL_ROOT: 'http://127.0.0.1:8000'
CREDENTIALS_DATA_DIR: '{{ COMMON_DATA_DIR }}/{{ credentials_service_name }}'
CREDENTIALS_MEDIA_ROOT: '{{ CREDENTIALS_DATA_DIR }}/media'
CREDENTIALS_MEDIA_URL: '/media/'
CREDENTIALS_STATIC_ROOT: '{{ CREDENTIALS_DATA_DIR }}/staticfiles'
CREDENTIALS_STATIC_URL: '/static/'
CREDENTIALS_SECRET_KEY: 'Your secret key here' CREDENTIALS_SECRET_KEY: 'Your secret key here'
CREDENTIALS_TIME_ZONE: 'UTC' CREDENTIALS_TIME_ZONE: 'UTC'
CREDENTIALS_LANGUAGE_CODE: 'en_US.UTF-8' CREDENTIALS_LANGUAGE_CODE: 'en_US.UTF-8'
...@@ -94,7 +100,11 @@ CREDENTIALS_SERVICE_CONFIG: ...@@ -94,7 +100,11 @@ CREDENTIALS_SERVICE_CONFIG:
SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ CREDENTIALS_OAUTH_URL_ROOT }}/oauth2' SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ CREDENTIALS_OAUTH_URL_ROOT }}/oauth2'
SOCIAL_AUTH_REDIRECT_IS_HTTPS: '{{ CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS }}' SOCIAL_AUTH_REDIRECT_IS_HTTPS: '{{ CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS }}'
STATIC_ROOT: "{{ COMMON_DATA_DIR }}/{{ credentials_service_name }}/staticfiles" MEDIA_ROOT: '{{ CREDENTIALS_MEDIA_ROOT }}'
MEDIA_URL: '{{ CREDENTIALS_MEDIA_URL }}'
STATIC_ROOT: '{{ CREDENTIALS_STATIC_ROOT }}'
STATIC_URL: '{{ CREDENTIALS_STATIC_URL }}'
# db config # db config
DATABASE_OPTIONS: DATABASE_OPTIONS:
connect_timeout: 10 connect_timeout: 10
......
...@@ -119,6 +119,17 @@ ...@@ -119,6 +119,17 @@
- migrate - migrate
- migrate:db - migrate:db
# var should have more permissive permissions than the rest
- name: create credentials var dirs
file: >
path="{{ item }}" state=directory mode=0775
owner="{{ credentials_user }}" group="{{ common_web_group }}"
with_items:
- "{{ CREDENTIALS_MEDIA_ROOT }}"
tags:
- install
- install:base
- name: write out the supervisor wrapper - name: write out the supervisor wrapper
template: template:
src: "edx/app/credentials/credentials.sh.j2" src: "edx/app/credentials/credentials.sh.j2"
......
...@@ -32,9 +32,14 @@ server { ...@@ -32,9 +32,14 @@ server {
listen {{ CREDENTIALS_NGINX_PORT }} {{ default_site }}; listen {{ CREDENTIALS_NGINX_PORT }} {{ default_site }};
{% endif %} {% endif %}
location ~ ^/static/(?P<file>.*) { location ~ ^{{ CREDENTIALS_MEDIA_URL }}(?P<file>.*) {
root {{ COMMON_DATA_DIR }}/{{ credentials_service_name }}; root {{ CREDENTIALS_MEDIA_ROOT }};
try_files /staticfiles/$file =404; try_files /$file =404;
}
location ~ ^{{ CREDENTIALS_STATIC_URL }}(?P<file>.*) {
root {{ CREDENTIALS_STATIC_ROOT }};
try_files /$file =404;
} }
location / { location / {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment