equal
deleted
inserted
replaced
10 |
10 |
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 |
16 |
16 # Absolute path to the directory that holds media. |
17 # Absolute path to the directory that holds media. |
17 # Example: "/home/media/media.lawrence.com/" |
18 # Example: "/home/media/media.lawrence.com/" |
18 MEDIA_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/" |
19 MEDIA_ROOT = BASE_STATIC_ROOT + "media/" |
19 |
20 |
20 |
21 |
21 # Absolute path to the directory that static files (js, css, swf...) |
22 # Absolute path to the directory that static files (js, css, swf...) |
22 # DO NOT forget to do command line ./manage.py collectstatic to gather static media into the web/static folder |
23 # DO NOT forget to do command line ./manage.py collectstatic to gather static media into the web/static folder |
23 STATIC_ROOT = MEDIA_ROOT + "site/" |
24 STATIC_ROOT = BASE_STATIC_ROOT + "site/" |
24 |
25 |
25 |
26 |
26 CONTENT_ROOT = MEDIA_ROOT + "media/content/" |
27 CONTENT_ROOT = BASE_STATIC_ROOT + "content/" |
27 |
28 |
28 # PATH where uploaded media are put. |
29 # PATH where uploaded media are put. |
29 STREAM_PATH = CONTENT_ROOT |
30 STREAM_PATH = CONTENT_ROOT |
30 |
31 |
31 |
32 |