1609

fabfile.py

@@ -86,8 +86,8 @@ def get_configs():
 def put_configs():
     localdir = join(LOCAL_HOME_DIR, 'support/', env.role)
     # nginx
-    # put(join(localdir, basename(nginx_conf)),
+    put(join(localdir, basename(nginx_conf)),
-    #     nginx_conf)
+        nginx_conf)
     # # apache2
     # put(join(localdir, basename(apache2_conf)),
     #     apache2_conf)

proj/middleware.py

@@ -2,8 +2,10 @@
 # from django.contrib.redirects.middleware import RedirectFallbackMiddleware
 import re
 
-from django.http import HttpResponsePermanentRedirect
 from django.core.urlresolvers import reverse
+from django.conf import settings
+from django.http import HttpResponsePermanentRedirect
+from django.utils.html import strip_spaces_between_tags
 
 from exposition.models import Exposition
 from country.models import Country
@@ -63,3 +65,16 @@ def check_places(slug):
     if Country.objects.filter(url=slug).exists():
         return HttpResponsePermanentRedirect(reverse('place_country', kwargs={'slug': slug}))
     return None
+
+
+# https://gist.github.com/b1/3155460
+""" spaceless middleware
+MIDDLEWARE_CLASSES += ('core_utils.middleware.SpacelessMiddleware',)
+"""
+class SpacelessMiddleware(object):
+    """ trim spaces between tags if not in DEBUG """
+    def process_response(self, request, response):
+        cont = response.content
+        cont = strip_spaces_between_tags(cont)
+        response.content = re.sub(r'^\s+<','<', cont )
+        return response

support/dev/hit.expomap.ru

@@ -22,8 +22,8 @@ server {
 
     client_header_timeout 360s;
     location / {
-    auth_basic "Unauthorized";
+    #auth_basic "Unauthorized";
-    auth_basic_user_file /home/www/proj/.htpasswd;
+    #auth_basic_user_file /home/www/proj/.htpasswd;
         proxy_pass http://127.0.0.1:8080/;
         proxy_redirect     off;
         proxy_set_header        Host            $host;
@@ -42,7 +42,6 @@ server {
         proxy_temp_file_write_size      2048k;
     }
 
-
     location /965E1EE7949FD639CA0124C8D8C57774.txt {
         root   /home/www/proj/;
     }
@@ -51,10 +50,10 @@ server {
         root /home/www/proj/support;
     }
 
-
     location /static {
         root   /home/www/proj;
     }
+
     location /media {
         root   /home/www/proj;
     }
@@ -62,10 +61,14 @@ server {
     location /templates {
         root   /home/www/proj/static;
     }
+
     location /subdmn {
         root /home/old_files;
     }
 
+    location ~* ^.+\.(rss|atom|jpg|jpeg|gif|png|ico|rtf|js|css)$ {
+        expires max;
+    }
 
 }
 

support/dev/settings.py

@@ -155,6 +155,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
     'proj.middleware.ExpoRedirectFallbackMiddleware',
+    'proj.middleware.SpacelessMiddleware',
 
 )
 

support/prod/settings.py

@@ -155,6 +155,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
     'proj.middleware.ExpoRedirectFallbackMiddleware',
+    'proj.middleware.SpacelessMiddleware',
 
 )