From f7812397efc486b848b566ebe1af9561cbd2f263 Mon Sep 17 00:00:00 2001
From: fefa4ka <fefa4ka@gmail.com>
Date: Fri, 23 Oct 2015 19:50:17 +0300
Subject: [PATCH] debug false

---
 app/conf/nginx.conf.template | 60 ++++++++++++++++++++++++------------
 app/settings.py              |  2 +-
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/app/conf/nginx.conf.template b/app/conf/nginx.conf.template
index 8a2944d..ac60feb 100644
--- a/app/conf/nginx.conf.template
+++ b/app/conf/nginx.conf.template
@@ -4,7 +4,43 @@ upstream django_zuykov {
 
 map $request_uri $new_uri {
     default "";
-    include /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/conf/redirects.map;
+    / http://zuykov.com/ru/;
+    /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/;
+    /calculator/ http://zuykov.com/ru/;
+    /clients/ http://zuykov.com/ru/about/our-clients/;
+    /contact/ http://zuykov.com/ru/about/contacts/;
+    /contacts/ http://zuykov.com/ru/about/contacts/;
+    /contracts/ http://zuykov.com/ru/agreements/;
+    /contracts/dogovor_ustupki/ http://zuykov.com/ru/agreements/alienation-agreement/;
+    /contracts/license_agreement/ http://zuykov.com/ru/agreements/licenzionnyj-dogovor/;
+    /copyright/ http://zuykov.com/ru/copyright/;
+    /courts* http://zuykov.com/ru/courts/;
+    /employers/ http://zuykov.com/ru/about/employees/;
+    /patents/ http://zuykov.com/ru/patents/;
+    /programs/ http://zuykov.com/ru/software/;
+    /request/ http://zuykov.com/ru/trademarks/;
+    /trademarks/ http://zuykov.com/ru/trademarks/;
+    /courts/zashchita-delovoi-reputacii/ http://zuykov.com/ru/courts/zashita-delovoj-reputacii/;
+    /courts/zashchita-osparivanie-patenta/ http://zuykov.com/ru/courts/zashita-prav-na-patent/;
+    /intellect_protection/ http://zuykov.com/ru/copyright/copyright-theory/copyright-origin/;
+    /internet_defence/ http://zuykov.com/ru/copyright/copyright-theory/copyright-origin/;
+    /patents/patents-industrial_samples/ http://zuykov.com/ru/patents/patentovanie-izobretenij-i-poleznyh-modelej/;
+    /patents/patents-inventions/ http://zuykov.com/ru/patents/patentovanie-izobretenij-i-poleznyh-modelej/;
+    /patents/patents-useful_models/ http://zuykov.com/ru/design-patents/patentovanie-izobretenij-i-poleznyh-modelej/;
+    /spory_v_sude/ http://zuykov.com/ru/trademarks/theory/zachem-registrirovat-tovarnyj-znak/;
+    /trademark_defence/ http://zuykov.com/ru/trademarks/theory/zachem-registrirovat-tovarnyj-znak/;
+    /trademarks/brand_registration/ http://zuykov.com/ru/trademarks/registraciya-tovarnogo-znaka/;
+    /trademarks/international_trademark http://zuykov.com/ru/trademarks/mezhdunarodnaya-registraciya-tovarnogo-znaka/;
+    /trademarks/logo_registration/ http://zuykov.com/ru/trademarks/registraciya-tovarnogo-znaka/;
+    /trademarks/poisk_trademark/ http://zuykov.com/ru/trademarks/poisk-tovarnogo-znaka/;
+    /trademarks/prodlenie_trademark/ http://zuykov.com/ru/trademarks/prodlenie-tovarnogo-znaka/;
+    /trademarks/razrabotka-tovarnogo-znaka/ http://zuykov.com/ru/trademarks/razrabotka-tovarnogo-znaka/;
+    /trademarks/trademark_registration/ http://zuykov.com/ru/trademarks/registraciya-tovarnogo-znaka/;
+    /trademarks/vnesenie-v-tamozhennyi-reestr/ http://zuykov.com/ru/trademarks/tamozhennyj-reestr/;
+
 }
 
 server {
@@ -13,33 +49,19 @@ server {
 
 server {
     listen       80;
-    server_name  dev.zuykov.com;
-    return       301 http://zuykov.com/ru;
-
-    location /robots.txt {
-        alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static/robots.txt;
-    } 
+    server_name  lala.zuykov.com zuykov.ru www.zuykov.ru www.zuykov.com;
 
     if ($new_uri != "") {
-        rewrite ^(.*)$ $new_uri permament;
+        rewrite ^(.*)$ $new_uri permanent;
     }
 
-}
+    rewrite ^(.*)$ http://zuykov.com$1 permanent;
 
-server {
-    listen       80;
-    server_name  www.zuykov.com;
-    return       301 http://zuykov.com$request_uri;
-
-    location /robots.txt {
-        alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static/robots.txt;
-    } 
 }
 
-
 server {
     listen      80;
-    server_name     zuykov.com;
+    server_name     dev.zuykov.com zuykov.com;
     charset     utf-8;
 
     client_max_body_size 124M;  
diff --git a/app/settings.py b/app/settings.py
index 2779b52..6ae606b 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 SECRET_KEY = '=%%a@whz46w1#=8ffk^a+8vya5fg-kz0ztyz!_@hdg-(5a9q+s'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 TEMPLATE_DEBUG = False