From d2bc9fbce13e63d008b334d5925fd76c2628d347 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Mon, 6 Jun 2016 16:36:59 +0300
Subject: [PATCH] =?UTF-8?q?1382:=20=D0=AD=D1=82=D0=B0=D0=BF=20=E2=84=964?=
 =?UTF-8?q?=20-=20=D0=9F=D1=80=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9=20done?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fabfile.py      | 10 +++++++++-
 service/urls.py |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index 06e7ee59..c57c10ff 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -109,9 +109,10 @@ def stage3_release():
     call_state('stop')
     with cd(REMOTE_HOME_DIR):
         # run('python manage.py themeblog_to_blog')
+        run('git fetch')
         run('git checkout stage3_release')
         run('git pull')
-        run('python manage.py migrate settings 0002 --fake')
+        # run('python manage.py migrate settings 0002 --fake')
         run('python manage.py migrate settings')
         run('python manage.py migrate article 0003')
         chown()
@@ -124,3 +125,10 @@ def c_fix():
         run('git pull')
         run('python manage.py migrate expobanner')
         call_state('start', only='apache2')
+
+
+def stage4():
+    with cd(REMOTE_HOME_DIR):
+        run('git fetch')
+        run('git checkout stage4')
+        pull()
diff --git a/service/urls.py b/service/urls.py
index 6476e1c6..9eee7cc6 100644
--- a/service/urls.py
+++ b/service/urls.py
@@ -4,10 +4,10 @@ from views import ServiceView, CallBackListView, VisitListView, TranslationListV
     ParticipationListView, RemoteListView,TicketsListView, Thanks
 
 urlpatterns = patterns('',
-    url(r'service/thanks/$', Thanks.as_view(), name = "service_thanks"),
-    url(r'service/com_rek/(?P<catalog>.*)/(?P<event_url>.*)/$', 'service.views.advertise'),
-    url(r'service/com_rek/$', 'service.views.advertise', name='advertise_post'),
-    url(r'service/(?P<url>.*)/$', ServiceView.as_view()),
+    url(r'^service/thanks/$', Thanks.as_view(), name = "service_thanks"),
+    url(r'^service/com_rek/(?P<catalog>.*)/(?P<event_url>.*)/$', 'service.views.advertise'),
+    url(r'^service/com_rek/$', 'service.views.advertise', name='advertise_post'),
+    url(r'^service/(?P<url>.*)/$', ServiceView.as_view()),
 
 )