Synchronize client/app

quentinfayet · Nov 19, 2015 · 4fb1361 · 4fb1361
1 parent 560b047
commit 4fb1361
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/language/language/urls.py b/application/language/language/urls.py
@@ -21,6 +21,6 @@
 router.register(r'accounts', AccountViewSet)
 
 urlpatterns = [
-    url(r'^api/v1/', include(router.urls)),
-    url(r'^api/v1/auth/login/$', LoginView.as_view(), name='login')
+    url(r'^api1/', include(router.urls)),
+    url(r'^api1/auth/login/$', LoginView.as_view(), name='login')
 ]
diff --git a/client/config/nginx.conf b/client/config/nginx.conf
@@ -15,7 +15,7 @@ http {
         }
 
         location /api/v1 {
-            rewrite ^/api1/(.*) /api/v1/$1 break;
+            rewrite ^/api/v1/(.*) /api1/$1 break;
             proxy_redirect off;
             proxy_pass http://pythonapp:8000;
         }