From b3279780e85c1ad2569a0c6bc33364cb2459dd13 Mon Sep 17 00:00:00 2001 From: Kirosbr Date: Thu, 27 Jun 2024 07:46:19 +0200 Subject: [PATCH 1/4] migration des ALLOWED_HOSTS et CORS dans le server_config --- Reskreen/settings.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 6204aa9..ace5792 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -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',) From 5403ec02e74e3690ff65ea550c12ff062d1c902a Mon Sep 17 00:00:00 2001 From: Kirosbr Date: Thu, 27 Jun 2024 07:49:23 +0200 Subject: [PATCH 2/4] migration des secrets --- Reskreen/settings.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index ace5792..2e99a5b 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -413,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" - - From 28e60a36cb299142f5672de2dfdc41dec36e040a Mon Sep 17 00:00:00 2001 From: Kirosbr Date: Thu, 27 Jun 2024 07:54:56 +0200 Subject: [PATCH 3/4] add version to ClercNet --- Reskreen/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 2e99a5b..08ead1a 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -251,7 +251,7 @@ JAZZMIN_SETTINGS = { "site_header": "ClercNet", # 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", From 4d9d3a38de2bf31f7cc7fbe2bcfc192a3fec4d41 Mon Sep 17 00:00:00 2001 From: Kirosbr Date: Thu, 27 Jun 2024 07:56:04 +0200 Subject: [PATCH 4/4] add version to site_header --- Reskreen/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 08ead1a..c84669b 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -248,7 +248,7 @@ 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 v3",