mitri4
/
zuykov
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

redirect fix

Browse Source
master
fefa4ka 10 years ago
parent a871c7390c
commit 41ee00ff14
2 changed files with 10 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      app/conf/nginx.conf.template
  2. 6
      app/conf/redirects.map

13
app/conf/nginx.conf.template
Unescape View File

@ -2,6 +2,11 @@ upstream django_zuykov {
server unix:///home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/wsgi.sock; 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 { server {
return 404; return 404;
} }
@ -15,12 +20,8 @@ server {
alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static/robots.txt; alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static/robots.txt;
} }
map $uri $new { if ($new_uri != "") {
include /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/conf/redirects.map; rewrite ^(.*)$ $new_uri permament;
}
if ($new) {
rewrite ^ $new redirect;
} }
} }

6
app/conf/redirects.map
Unescape View File

@ -1,5 +1,5 @@
/ http://zuykov.com/ru/; / http://zuykov.com/ru/;
/about/ http://zuykov.com/ru/about/ /about/ http://zuykov.com/ru/about/;
/about/employers/ http://zuykov.com/ru/about/employees/; /about/employers/ http://zuykov.com/ru/about/employees/;
/avtorskie_prava_book/ http://zuykov.com/ru/copyright/registration/; /avtorskie_prava_book/ http://zuykov.com/ru/copyright/registration/;
/avtorskie_prava_song/ 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/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/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-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/ 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/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/; /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/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/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/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/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/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/; /trademarks/prodlenie_trademark/ http://zuykov.com/ru/trademarks/prodlenie-tovarnogo-znaka/;

Write Preview
Loading…
Cancel
Save