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.*)/(?P.*)/$', 'service.views.advertise'), - url(r'service/com_rek/$', 'service.views.advertise', name='advertise_post'), - url(r'service/(?P.*)/$', ServiceView.as_view()), + url(r'^service/thanks/$', Thanks.as_view(), name = "service_thanks"), + url(r'^service/com_rek/(?P.*)/(?P.*)/$', 'service.views.advertise'), + url(r'^service/com_rek/$', 'service.views.advertise', name='advertise_post'), + url(r'^service/(?P.*)/$', ServiceView.as_view()), )