Merge branch 'master' of code.ungleich.ch:uncloud/uncloud

This commit is contained in:
Nico Schottelius 2020-11-17 11:47:53 +01:00
commit ad0c2f1e9d
6 changed files with 362 additions and 16 deletions

1
uncloud/.gitignore vendored
View file

@ -1 +1,2 @@
local_settings.py
ldap_max_uid_file

View file

@ -65,6 +65,7 @@ router.register(r'v1/admin/vpnpool', netviews.VPNPoolViewSet)
# User/Account
router.register(r'v1/my/user', authviews.UserViewSet, basename='user')
router.register(r'v1/admin/user', authviews.AdminUserViewSet, basename='useradmin')
router.register(r'v1/user/register', authviews.AccountManagementViewSet, basename='user/register')
urlpatterns = [
path(r'api/', include(router.urls)),