From 41ee00ff14ad73ef5c440cf04b1afba39124da2a Mon Sep 17 00:00:00 2001
From: fefa4ka <fefa4ka@gmail.com>
Date: Fri, 23 Oct 2015 18:45:49 +0300
Subject: [PATCH] redirect fix

---
 app/conf/nginx.conf.template | 13 +++++++------
 app/conf/redirects.map       |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/conf/nginx.conf.template b/app/conf/nginx.conf.template
index f7463b4..8a2944d 100644
--- a/app/conf/nginx.conf.template
+++ b/app/conf/nginx.conf.template
@@ -2,6 +2,11 @@ upstream django_zuykov {
     server unix:///home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/wsgi.sock;
 }
 
+map $request_uri $new_uri {
+    default "";
+    include /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/conf/redirects.map;
+}
+
 server {
     return 404;
 }
@@ -15,12 +20,8 @@ server {
         alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static/robots.txt;
     } 
 
-    map $uri $new {
-        include /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/conf/redirects.map;
-    }
-
-    if ($new) {
-        rewrite ^ $new redirect;
+    if ($new_uri != "") {
+        rewrite ^(.*)$ $new_uri permament;
     }
 
 }
diff --git a/app/conf/redirects.map b/app/conf/redirects.map
index 28369fc..0c57aed 100644
--- a/app/conf/redirects.map
+++ b/app/conf/redirects.map
@@ -1,5 +1,5 @@
 /   http://zuykov.com/ru/;
-/about/ http://zuykov.com/ru/about/
+/about/ http://zuykov.com/ru/about/;
 /about/employers/   http://zuykov.com/ru/about/employees/;
 /avtorskie_prava_book/  http://zuykov.com/ru/copyright/registration/;
 /avtorskie_prava_song/  http://zuykov.com/ru/copyright/registration/;
@@ -34,7 +34,7 @@
 /courts/zashchita-osparivanie-prava-na-programmu/priznanie-avtorskogo-prava-na-programmy-v-sude/    http://zuykov.com/ru/software/priznanie-avtorskih-prav/;
 /courts/zashchita-osparivanie-prava-na-programmu/ustanovlenie-pravoobladatelya-programmy/   http://zuykov.com/ru/software/ustanovlenie-pravoobladatelya/;
 /courts/zashchita-osparivanie-prava-na-programmu/zashchita-prav-na-programmu-v-sude/    http://zuykov.com/ru/software/zashita-avtorskih-i-isklyuchitelnyh-prav/;
-/courts/zashchita-osparivanie-tovarnogo-znaka/  http://zuykov.com/ru/courts/#trademarks 
+/courts/zashchita-osparivanie-tovarnogo-znaka/  http://zuykov.com/ru/courts/#trademarks;
 /courts/zashchita-osparivanie-tovarnogo-znaka/dosrochnoe-prekrashchenie-tovarnogo-zkaka/    http://zuykov.com/ru/courts/prekrashenie-dejstviya-tovarnogo-znaka/;
 /courts/zashchita-osparivanie-tovarnogo-znaka/dosrochnoe-prekrashchenie-tovarnogo-zkaka/prekashchenie-tovarnogo-znaka-neispolzovanie/   http://zuykov.com/ru/trademarks/prekrashenie-dejstviya-tovarnogo-znaka/;
 /courts/zashchita-osparivanie-tovarnogo-znaka/dosrochnoe-prekrashchenie-tovarnogo-zkaka/prekrashchenie-znak-vseobshchee-upotreblenie/   http://zuykov.com/ru/courts/zapret-nezakonnogo-ispolzovaniya/;
@@ -70,7 +70,7 @@
 /trademarks/logo_registration/  http://zuykov.com/ru/trademarks/registraciya-tovarnogo-znaka/;
 /trademarks/mezhdunarodnaya-registraciya-po-madridskoi-sisteme/     http://zuykov.com/ru/trademarks/mezhdunarodnaya-registraciya-tovarnogo-znaka/;
 /trademarks/obshcheisvestnyi-tovarnyi-znak/     http://zuykov.com/ru/trademarks/obsheizvestnyj-tovarnyj-znak/;
-/trademarks/podacha-zayavki-na-registraciu-tovarnogo-znaka/     http://zuykov.com/ru/trademarks/theory/process-registracii-tovarnogo-znaka/  
+/trademarks/podacha-zayavki-na-registraciu-tovarnogo-znaka/     http://zuykov.com/ru/trademarks/theory/process-registracii-tovarnogo-znaka/;
 /trademarks/poisk_trademark/    http://zuykov.com/ru/trademarks/poisk-tovarnogo-znaka/;
 /trademarks/poluchenie-svidetelstva-na-tovarnyi-znak/   http://zuykov.com/ru/trademarks/poluchenie-svidetelstva-na-tovarnyj-znak/;
 /trademarks/prodlenie_trademark/    http://zuykov.com/ru/trademarks/prodlenie-tovarnogo-znaka/;