Merge branch 'master' of https://gitea.prod.resk-u.ch/CLERC/Reskreen
This commit is contained in:
@@ -27,14 +27,6 @@ BASE_DIR = Path(__file__).resolve().parent.parent
|
||||
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
|
||||
LOGIN_REDIRECT_URL = '/admin'
|
||||
INSTALLED_APPS = [
|
||||
@@ -137,15 +129,7 @@ MIDDLEWARE = [
|
||||
|
||||
CRON_CLASSES = [
|
||||
"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',)
|
||||
@@ -264,10 +248,10 @@ JAZZMIN_SETTINGS = {
|
||||
"site_title": "ClercNet-Admin",
|
||||
|
||||
# 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)
|
||||
"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
|
||||
"site_logo": "img/logo_clerc_200.png",
|
||||
@@ -429,10 +413,3 @@ JAZZMIN_UI_TWEAKS = {
|
||||
# https://pypi.org/project/whitenoise/
|
||||
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"
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user