equal
deleted
inserted
replaced
11 STREAM_URL = "rtmp://localhost/vod/media/" |
11 STREAM_URL = "rtmp://localhost/vod/media/" |
12 |
12 |
13 STREAM_SRC_PREFIX = "" |
13 STREAM_SRC_PREFIX = "" |
14 |
14 |
15 BASE_STATIC_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/" |
15 BASE_STATIC_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/" |
|
16 BASE_STATIC_URL = BASE_URL + 'static/' |
16 |
17 |
17 # Absolute path to the directory that holds media. |
18 # Absolute path to the directory that holds media. |
18 # Example: "/home/media/media.lawrence.com/" |
19 # Example: "/home/media/media.lawrence.com/" |
19 MEDIA_ROOT = BASE_STATIC_ROOT + "media/" |
20 MEDIA_ROOT = BASE_STATIC_ROOT + "media/" |
20 |
21 |
29 |
30 |
30 CONTENT_ROOT = BASE_STATIC_ROOT + "content/" |
31 CONTENT_ROOT = BASE_STATIC_ROOT + "content/" |
31 |
32 |
32 # PATH where uploaded media are put. |
33 # PATH where uploaded media are put. |
33 STREAM_PATH = CONTENT_ROOT |
34 STREAM_PATH = CONTENT_ROOT |
|
35 |
|
36 ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' |
|
37 LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/' |
|
38 |
34 |
39 |
35 |
40 |
36 DATABASES = { |
41 DATABASES = { |
37 'default': { |
42 'default': { |
38 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. |
43 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. |