From a871c7390c50004b6e55d7c7fe7b5196c33db1d2 Mon Sep 17 00:00:00 2001 From: fefa4ka Date: Fri, 23 Oct 2015 18:29:09 +0300 Subject: [PATCH] url fix --- app/conf/nginx.conf.template | 2 +- app/conf/prepare_urls.sh | 4 ++++ app/conf/{old_urls.map => redirects.map} | 13 ++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 app/conf/prepare_urls.sh rename app/conf/{old_urls.map => redirects.map} (97%) diff --git a/app/conf/nginx.conf.template b/app/conf/nginx.conf.template index 9ab2f38..f7463b4 100644 --- a/app/conf/nginx.conf.template +++ b/app/conf/nginx.conf.template @@ -16,7 +16,7 @@ server { } map $uri $new { - include /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/conf/old_urls.map; + include /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/conf/redirects.map; } if ($new) { diff --git a/app/conf/prepare_urls.sh b/app/conf/prepare_urls.sh new file mode 100644 index 0000000..2bb018f --- /dev/null +++ b/app/conf/prepare_urls.sh @@ -0,0 +1,4 @@ +#!/bin/sh +while read SOURCE DEST; do + echo "rewrite $SOURCE $DEST permanent; +done < redirects.txt > redirects.conf \ No newline at end of file diff --git a/app/conf/old_urls.map b/app/conf/redirects.map similarity index 97% rename from app/conf/old_urls.map rename to app/conf/redirects.map index 37c4dbe..28369fc 100644 --- a/app/conf/old_urls.map +++ b/app/conf/redirects.map @@ -23,7 +23,7 @@ /courts/zashchita-osparivanie-patenta/osparivanie-patenta-isobretenie/ http://zuykov.com/ru/courts/osparivanie-i-prekrashenie-dejstviya-patenta/; /courts/zashchita-osparivanie-patenta/osparivanie-patenta-isobretenie/nedobrosovesnaya-konkurrenciya-priobretenie-patent/ http://zuykov.com/ru/courts/zashita-ot-nedorosovestnoj-konkurencii/; /courts/zashchita-osparivanie-patenta/osparivanie-patenta-isobretenie/osparivanie-reshenij-rospatent-patent-intellectual/ http://zuykov.com/ru/courts/osparivanie-i-prekrashenie-dejstviya-patenta/; -/courts/zashchita-osparivanie-patenta/osparivanie-patenta-isobretenie/osparivanie-zashchita-patenta-rospatent/ http://zuykov.com/ru/courts/osparivanie-i-prekrashenie-dejstviya-patenta/ +/courts/zashchita-osparivanie-patenta/osparivanie-patenta-isobretenie/osparivanie-zashchita-patenta-rospatent/ http://zuykov.com/ru/courts/osparivanie-i-prekrashenie-dejstviya-patenta/; /courts/zashchita-osparivanie-patenta/zashchita-prav-na-patent/ http://zuykov.com/ru/courts/zashita-prav-na-patent/; /courts/zashchita-osparivanie-patenta/zashchita-prav-na-patent/otvetstvennost-nezakonnoe-ispolzovanie-patenta/ http://zuykov.com/ru/copyright/copyright-theory/copyright-origin-copy-2/; /courts/zashchita-osparivanie-patenta/zashchita-prav-na-patent/priznanie-nedobrosovestnoi-konkurenciej-patenta/ http://zuykov.com/ru/courts/zashita-ot-nedorosovestnoj-konkurencii/; @@ -38,10 +38,10 @@ /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/; -/courts/zashchita-osparivanie-tovarnogo-znaka/osparivanie_tovarnogo_znaka/ http://zuykov.com/ru/trademarks/osparivanie-deystviya-tovarnogo-znaka/ +/courts/zashchita-osparivanie-tovarnogo-znaka/osparivanie_tovarnogo_znaka/ http://zuykov.com/ru/trademarks/osparivanie-deystviya-tovarnogo-znaka/; /courts/zashchita-osparivanie-tovarnogo-znaka/osparivanie_tovarnogo_znaka/nedobrosovesnaya-konkurrencia-registracyja-priobre/ http://zuykov.com/ru/courts/osparivanie-tovarnogo-znaka/; /courts/zashchita-osparivanie-tovarnogo-znaka/osparivanie_tovarnogo_znaka/osparivanie-reshenij-rospatenta-tovarnye-znaki/ http://zuykov.com/ru/courts/osparivanie-tovarnogo-znaka/; -/courts/zashchita-osparivanie-tovarnogo-znaka/osparivanie_tovarnogo_znaka/osparivanie-zashchita-tovarnogo-znaka-rospatent/ http://zuykov.com/ru/courts/#trademarks +/courts/zashchita-osparivanie-tovarnogo-znaka/osparivanie_tovarnogo_znaka/osparivanie-zashchita-tovarnogo-znaka-rospatent/ http://zuykov.com/ru/courts/#trademarks; /courts/zashchita-osparivanie-tovarnogo-znaka/zashchita-prav-na-tovarnyi-znak/ http://zuykov.com/ru/courts/zashita-prav-na-tovarnyj-znak/; /courts/zashchita-osparivanie-tovarnogo-znaka/zashchita-prav-na-tovarnyi-znak/nedobrosovestnaya-konkurenciya-tovarny-znak/ http://zuykov.com/ru/courts/zashita-prav-na-tovarnyj-znak/; /courts/zashchita-osparivanie-tovarnogo-znaka/zashchita-prav-na-tovarnyi-znak/otvetstvennost-za-nezakonnoe-ispolzovanie-tovarnog/ http://zuykov.com/ru/copyright/copyright-theory/copyright-origin-copy-2/; @@ -52,15 +52,14 @@ /courts/zashchita-ot-nedobrosovestnoi-konkurencii/nedobrosovestnaya-registraciya/ http://zuykov.com/ru/courts/zashita-ot-nedorosovestnoj-konkurencii/; /courts/zashchita-ot-nedobrosovestnoi-konkurencii/nedobrosovestnoe-ispolzovanie/ http://zuykov.com/ru/courts/zashita-ot-nedorosovestnoj-konkurencii/; /courts/zashcita-prav-na-tovarnyi-znak/ http://zuykov.com/ru/courts/zashita-prav-na-tovarnyj-znak/; -/employers/ http://zuykov.com/ru/about/employees/ +/employers/ http://zuykov.com/ru/about/employees/; /intellect_protection/ http://zuykov.com/ru/copyright/copyright-theory/copyright-origin/; /internet_defence/ http://zuykov.com/ru/copyright/copyright-theory/copyright-origin/; -/notified-Notify_Uncategorized/?aHR0cDovL3d3dy56dXlrb3YucnUv 404 /patents/ http://zuykov.com/ru/patents/theory/process-patentovaniya/; /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/; -/programs/ http://zuykov.com/ru/software/registraciya-programmy/ +/programs/ http://zuykov.com/ru/software/registraciya-programmy/; /request/ http://zuykov.com/ru/trademarks/; /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/; @@ -77,4 +76,4 @@ /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/ \ No newline at end of file +/trademarks/vnesenie-v-tamozhennyi-reestr/ http://zuykov.com/ru/trademarks/tamozhennyj-reestr/; \ No newline at end of file