From c1649d03ddd01c817071a86ec990c93f6e7538c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?= <benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de> Date: Tue, 29 Oct 2019 15:57:37 +0100 Subject: [PATCH] Introduce optional settings subfolder The subfolder is not under version control, however, you can place another version controlled source here if needed --- .gitignore | 3 +++ AKPlanning/settings.py | 10 ++++++++++ requirements.txt | 1 + 3 files changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index 7410ef75..2617e904 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ # Secrets for production AKPlanning/settings_secrets.py +# Settings subfolder +AKPlanning/settings/ + # static files generated by django /static/ diff --git a/AKPlanning/settings.py b/AKPlanning/settings.py index 77fe20b2..ae81292a 100644 --- a/AKPlanning/settings.py +++ b/AKPlanning/settings.py @@ -15,6 +15,8 @@ from django.utils.translation import gettext_lazy as _ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) +from split_settings.tools import optional, include + BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production @@ -147,3 +149,11 @@ FONTAWESOME_CSS_URL = "//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/ # Treat wishes as seperate category in submission views? WISHES_AS_CATEGORY = True + +FOOTER_INFO = { + "repo_url": "https://gitlab.fachschaften.org/kif/akplanning", + "impress_text": "", + "impress_url": "" +} + +include(optional("settings/*.py")) diff --git a/requirements.txt b/requirements.txt index 3dde3db5..cdccac9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ Django==2.2.6 django-bootstrap4==1.0.1 django-fontawesome==1.0 +django-split-settings==1.0.0 -- GitLab