From d5041030000685a51a922b1cb0c53805d208c525 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Fri, 17 Jul 2020 17:26:04 +0200
Subject: [PATCH] updated config handling
---
uffd/__init__.py | 2 --
uffd/default_config.cfg | 15 ++++++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/uffd/__init__.py b/uffd/__init__.py
index 7dfe0dcf..43ab85f6 100644
--- a/uffd/__init__.py
+++ b/uffd/__init__.py
@@ -16,10 +16,8 @@ def create_app(test_config=None):
# set development default config values
app.config.from_mapping(
- TEMPLATES_AUTO_RELOAD=True,
SECRET_KEY=secrets.token_hex(128),
SQLALCHEMY_DATABASE_URI="sqlite:///{}".format(os.path.join(app.instance_path, 'uffd.sqlit3')),
- SQLALCHEMY_ECHO=True,
)
app.config.from_pyfile('default_config.cfg')
diff --git a/uffd/default_config.cfg b/uffd/default_config.cfg
index 58b85012..f6405eec 100644
--- a/uffd/default_config.cfg
+++ b/uffd/default_config.cfg
@@ -7,9 +7,10 @@ LDAP_USER_OBJECTCLASSES=["vmailUser", "top", "inetOrgPerson", "organizationalPer
LDAP_USER_GID=20001
LDAP_USER_MIN_UID=10000
LDAP_USER_MAX_UID=18999
+
SESSION_LIFETIME_SECONDS=3600
-ACL_LDAP_GROUP_USEREDIT="admins"
+ACL_LDAP_GROUP_USEREDIT="admins"
ACL_ADMIN_GROUP="admin"
ACL_SELFSERVICE_GROUP="user"
@@ -19,3 +20,15 @@ MAIL_USERNAME='yourId@gmail.com'
MAIL_PASSWORD='*****'
MAIL_USE_STARTTLS=True
MAIL_FROM_ADDRESS='foo@bar.com'
+
+# do NOT set in production
+
+#TEMPLATES_AUTO_RELOAD=True
+#SQLALCHEMY_ECHO=True
+#FLASK_ENV=development
+
+# DO set in production
+
+# SECRET_KEY=<long key>
+# FLASK_ENV=production
+# SQLALCHEMY_DATABASE_URI=<path>
--
GitLab