CLERC/Reskreen
6
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Merge branch 'master' of https://gitea.prod.resk-u.ch/CLERC/Reskreen

Browse Source
This commit is contained in:
Cloud User
2024-06-27 08:02:53 +02:00
parent 0c748b7658 4d9d3a38de
commit 1767ebd317
1 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Reskreen/settings.py
View File

@@ -27,14 +27,6 @@ BASE_DIR = Path(__file__).resolve().parent.parent
DEBUG = cfg_dev_mode DEBUG = cfg_dev_mode
ALLOWED_HOSTS = ["rh.ambulance-clerc.ch"]
if cfg_dev_mode:
ALLOWED_HOSTS.append("127.0.0.1")
ALLOWED_HOSTS.append("33.144.144.6")
ALLOWED_HOSTS.append("33.144.144.13")
CSRF_TRUSTED_ORIGINS = ['https://rh.ambulance-clerc.ch']
# Application definition # Application definition
LOGIN_REDIRECT_URL = '/admin' LOGIN_REDIRECT_URL = '/admin'
INSTALLED_APPS = [ INSTALLED_APPS = [
@@ -137,15 +129,7 @@ MIDDLEWARE = [
CRON_CLASSES = [ CRON_CLASSES = [
"mycaldav.cron.InitTaskSync", "mycaldav.cron.InitTaskSync",
] ]
CORS_ALLOWED_ORIGINS = [
"http://33.144.144.13:4173",
"http://33.144.144.13:5173",
"http://33.144.144.13:3000",
]
MIDDLEWARE += ('apilog.middleware.APILogMiddleware',) MIDDLEWARE += ('apilog.middleware.APILogMiddleware',)
@@ -264,10 +248,10 @@ JAZZMIN_SETTINGS = {
"site_title": "ClercNet-Admin", "site_title": "ClercNet-Admin",
# Title on the login screen (19 chars max) (defaults to current_admin_site.site_header if absent or None) # Title on the login screen (19 chars max) (defaults to current_admin_site.site_header if absent or None)
"site_header": "ClercNet", "site_header": "ClercNet v3.0",
# Title on the brand (19 chars max) (defaults to current_admin_site.site_header if absent or None) # Title on the brand (19 chars max) (defaults to current_admin_site.site_header if absent or None)
"site_brand": "ClercNet", "site_brand": "ClercNet v3",
# Logo to use for your site, must be present in static files, used for brand on top left # Logo to use for your site, must be present in static files, used for brand on top left
"site_logo": "img/logo_clerc_200.png", "site_logo": "img/logo_clerc_200.png",
@@ -429,10 +413,3 @@ JAZZMIN_UI_TWEAKS = {
# https://pypi.org/project/whitenoise/ # https://pypi.org/project/whitenoise/
STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
if cfg_dev_mode:
NEXTCLOUD_HOST = "cloud.ambulance-clerc.ch"
else:
NEXTCLOUD_HOST = "cloud.ambulance-clerc.ch"
NEXTCLOUD_USER_DEFAULT_PASSWORD = "Mc144*1870"