From 94007c20f2f4b24523b395fcffdcb4d1f7bc70fb Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Tue, 27 Mar 2018 17:32:04 +0200
Subject: [PATCH] Rename python-auth -> common-web submodule
---
.gitmodules | 4 ++--
auth => common | 0
config.py.example | 2 +-
shared.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
rename auth => common (100%)
diff --git a/.gitmodules b/.gitmodules
index 7239078..87aa32e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "auth"]
- path = auth
- url = git@git.fsmpi.rwth-aachen.de:protokollsystem/python-auth.git
+ path = common
+ url = git@git.fsmpi.rwth-aachen.de:protokollsystem/common-web.git
diff --git a/auth b/common
similarity index 100%
rename from auth
rename to common
diff --git a/config.py.example b/config.py.example
index a199e84..19e0343 100644
--- a/config.py.example
+++ b/config.py.example
@@ -73,7 +73,7 @@ SESSION_PROTECTION = "strong" # do not change
# authentication
SECURITY_KEY = "some other random string" # change this
AUTH_MAX_DURATION = 300
-from auth.auth import LdapManager, ADManager, StaticUserManager
+from common.auth import LdapManager, ADManager, StaticUserManager
AUTH_BACKENDS = [
LdapManager(
host="ldap.example.com",
diff --git a/shared.py b/shared.py
index 50ee715..450aa05 100644
--- a/shared.py
+++ b/shared.py
@@ -124,7 +124,7 @@ def code_filter(text):
return "<code>{}</code>".format(text)
-from auth.auth import UserManager, SecurityManager, User
+from common.auth import UserManager, SecurityManager, User
max_duration = getattr(config, "AUTH_MAX_DURATION")
user_manager = UserManager(backends=config.AUTH_BACKENDS)
security_manager = SecurityManager(config.SECURITY_KEY, max_duration)
--
GitLab