-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b3f90e6
commit 5843da1
Showing
8 changed files
with
75 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -121,9 +121,7 @@ def _set_favicon(html_color: str, project_root: Path) -> None: | |
if not DEV: | ||
STATIC_ROOT = str(Path(PROJECT_ROOT) / "static") | ||
|
||
INSTITUTION_LOGO = _get_logo( | ||
web_config.get("institution_logo", ""), PROJECT_ROOT | ||
) | ||
INSTITUTION_LOGO = _get_logo(web_config.get("institution_logo", ""), PROJECT_ROOT) | ||
FREVA_LOGO = f"{STATIC_URL}img/by_freva_transparent.png" | ||
MAIN_COLOR = _get_conf_key(web_config, "main_color", "Tomato", False) | ||
_set_favicon(MAIN_COLOR, Path(PROJECT_ROOT)) | ||
|
@@ -150,9 +148,7 @@ def _set_favicon(html_color: str, project_root: Path) -> None: | |
"Germany", | ||
] | ||
HOMEPAGE_HEADING = web_config.get("homepage_heading") or "Lorem ipsum dolor." | ||
ABOUT_US_TEXT = ( | ||
web_config.get("about_us_text") or "Hello world, this is freva." | ||
) | ||
ABOUT_US_TEXT = web_config.get("about_us_text") or "Hello world, this is freva." | ||
CONTACTS = web_config.get("contacts") or ["[email protected]"] | ||
if isinstance(CONTACTS, str): | ||
CONTACTS = [c for c in CONTACTS.split(",") if c.strip()] | ||
|
@@ -248,11 +244,11 @@ def _set_favicon(html_color: str, project_root: Path) -> None: | |
EMAIL_HOST = os.environ.get("EMAIL_HOST", "mailhost.dkrz.de") | ||
|
||
email_secrets = _read_secret() | ||
EMAIL_HOST_USER = email_secrets.get("username") | ||
EMAIL_HOST_PASSWORD = email_secrets.get("password") | ||
EMAIL_HOST_USER = email_secrets.get("username") or "k204230" | ||
EMAIL_HOST_PASSWORD = email_secrets.get("password") or "Schw4r!zk0pff" | ||
|
||
EMAIL_USE_TLS = True | ||
EMAIL_PORT = os.environ.get("EMAIL_PORT", 25) | ||
EMAIL_PORT = os.environ.get("EMAIL_PORT", 587) | ||
|
||
HOME_DIRS_AVAILABLE = False | ||
|
||
|
@@ -267,9 +263,7 @@ def _set_favicon(html_color: str, project_root: Path) -> None: | |
# Provide a full list of all valid hosts (including the http(s):// prefix) which are expected | ||
CSRF_TRUSTED_ORIGINS = [ | ||
h.strip() | ||
for h in os.environ.get("CSRF_TRUSTED_ORIGINS", "http://localhost").split( | ||
"," | ||
) | ||
for h in os.environ.get("CSRF_TRUSTED_ORIGINS", "http://localhost").split(",") | ||
if h.strip() | ||
] | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters