фикс collectstatic с мастер ветки

proj/settings.py

@@ -90,10 +90,7 @@ USE_L10N = False
 USE_TZ = False
 
 
-MEDIA_ROOT = os.path.join(SITE_ROOT, 'media/')
 CKEDITOR_UPLOAD_PATH = os.path.join(SITE_ROOT, 'media/upload')
-
-
 CKEDITOR_CONFIGS = {
     'default': {
         'toolbar': 'standart',
@@ -119,11 +116,12 @@ CKEDITOR_CONFIGS = {
 }
 
 MEDIA_URL = '/media/'
+MEDIA_ROOT = os.path.join(SITE_ROOT, 'media/')
 
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(SITE_ROOT, 'collected_static')
 STATICFILES_DIRS = (
-    'static',
+    os.path.join(SITE_ROOT, 'static'),
 )
 
 STATICFILES_FINDERS = (
@@ -461,7 +459,6 @@ HAYSTACK_CONNECTIONS = {
 
 """
 
-THUMBNAIL_DEBUG = DEBUG
 THUMBNAIL_ENGINE = "proj.sorlengine.SorlEngine"
 THUMBNAIL_FORMAT = "PNG"
 

support/nginx.conf

@@ -45,7 +45,7 @@ server {
     location /static {
         access_log off;
         expires max;
-        root   /home/www/proj;
+        alias   /home/www/proj/collected_static;
     }
 
     location /media {
@@ -57,7 +57,7 @@ server {
     location /templates {
         access_log off;
         expires max;
-        root   /home/www/proj/static;
+        alias   /home/www/proj/collected_static/templates;
     }
 
 }