From df2cd4cfa3f64f6583a1f2ec1dd3178a9d721eda Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Fri, 11 Aug 2023 16:23:42 +0000 Subject: [PATCH 01/17] Actualiser Reskreen/settings.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changement de sécurité sur la configuration DEBUG Signed-off-by: Brocas Mathieu --- Reskreen/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 892beaa..23901c0 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -1,4 +1,4 @@ -""" +""" Django settings for Reskreen project. Generated by 'django-admin startproject' using Django 4.0. @@ -25,7 +25,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = 'django-insecure-j4jd&+4j^t_=@zr(#q@n!8e*58vkql6&_6w-t14ju8pw%ei%^s' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = cfg_dev_mode ALLOWED_HOSTS = ["rh.ambulance-clerc.ch"] From 4603317a203dfd0e99fe5053d675a031cffa82ae Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Fri, 11 Aug 2023 16:56:55 +0000 Subject: [PATCH 02/17] Actualiser requirements.txt ajout selection langue Signed-off-by: Brocas Mathieu --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e1a40bb..0dd71c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,4 +56,5 @@ xhtml2pdf==0.2.7 zopfli==0.1.9 django-autologin django-summernote -django-jazzmin \ No newline at end of file +django-jazzmin +django-default-language \ No newline at end of file From 3f5e95086a70362c14dfaad798377a013482dd11 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Fri, 11 Aug 2023 16:57:47 +0000 Subject: [PATCH 03/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 23901c0..5959e31 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -52,8 +52,11 @@ INSTALLED_APPS = [ 'django.contrib.admin', 'carnet_rouge.apps.CarnetRougeConfig', 'django_summernote', + 'django.middleware.locale.LocaleMiddleware', ] +LANGUAGE_CODE = 'fr-CH' + if not cfg_dev_mode: INSTALLED_APPS.append('nextcloud.apps.NextcloudConfig') From 30201c4d1acfefa17cfac81c12a4821c89bb1bb7 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 05:35:09 +0000 Subject: [PATCH 04/17] Actualiser Reskreen/settings.py modif pour passage en production --- Reskreen/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 5959e31..8254856 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -208,6 +208,7 @@ STATIC_URL = 'static/' STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), ] +STATIC_ROOT = "/var/www/reskreen/static/" # Default primary key field type From f9101b0bf853a2c9dd5686678e3921649cfcb2ef Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 05:38:33 +0000 Subject: [PATCH 05/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 8254856..09b70fd 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -52,6 +52,7 @@ INSTALLED_APPS = [ 'django.contrib.admin', 'carnet_rouge.apps.CarnetRougeConfig', 'django_summernote', + 'language.DefaultLanguageMiddleware', 'django.middleware.locale.LocaleMiddleware', ] From 5ba65a1b58b0972388b6258632abcf3fa732a729 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 05:40:01 +0000 Subject: [PATCH 06/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 09b70fd..6b60942 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -51,9 +51,7 @@ INSTALLED_APPS = [ 'rangefilter', 'django.contrib.admin', 'carnet_rouge.apps.CarnetRougeConfig', - 'django_summernote', - 'language.DefaultLanguageMiddleware', - 'django.middleware.locale.LocaleMiddleware', + 'django_summernote', ] LANGUAGE_CODE = 'fr-CH' @@ -113,6 +111,8 @@ MIDDLEWARE = [ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django_autologin.middleware.AutomaticLoginMiddleware', + 'language.DefaultLanguageMiddleware', + 'django.middleware.locale.LocaleMiddleware', ] ROOT_URLCONF = 'Reskreen.urls' From bdf972504ee4719ed5bd286a1c077fa2fc5712fc Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 05:59:20 +0000 Subject: [PATCH 07/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 6b60942..cba5fe7 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -209,7 +209,7 @@ STATIC_URL = 'static/' STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), ] -STATIC_ROOT = "/var/www/reskreen/static/" +STATIC_ROOT = os.path.join(BASE_DIR, "static") # Default primary key field type From d21e9a327f53acb5a12b5390814291f8d13f5d93 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 06:00:20 +0000 Subject: [PATCH 08/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index cba5fe7..422dd82 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -209,7 +209,7 @@ STATIC_URL = 'static/' STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), ] -STATIC_ROOT = os.path.join(BASE_DIR, "static") +#STATIC_ROOT = os.path.join(BASE_DIR, "static") # Default primary key field type From 9ba642698722f461baa450782b563c7b45c7ada6 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 06:10:21 +0000 Subject: [PATCH 09/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 422dd82..a7c0ccb 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -204,12 +204,12 @@ USE_L10N = False # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.0/howto/static-files/ -STATIC_URL = 'static/' +STATIC_URL = 'http://195.15.243.193/static/' STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), ] -#STATIC_ROOT = os.path.join(BASE_DIR, "static") +STATIC_ROOT = os.path.join(BASE_DIR, "static") # Default primary key field type From ca18b36c15a925ca5f828a46071b21e946c183df Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 06:11:32 +0000 Subject: [PATCH 10/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index a7c0ccb..64dd96a 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -209,7 +209,7 @@ STATIC_URL = 'http://195.15.243.193/static/' STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), ] -STATIC_ROOT = os.path.join(BASE_DIR, "static") +STATIC_ROOT = "/var/www/reskreen/static" # Default primary key field type From e3b6195fad8505461e5540f04c12590d1edecfa2 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 06:55:23 +0000 Subject: [PATCH 11/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 64dd96a..f5c0552 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -204,7 +204,7 @@ USE_L10N = False # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.0/howto/static-files/ -STATIC_URL = 'http://195.15.243.193/static/' +STATIC_URL = 'https://statics.ambulance-clerc.ch/static/' STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), From 1cddd8b523d9e38c418bac2fcee8ee4e0a553c2b Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 07:07:28 +0000 Subject: [PATCH 12/17] Actualiser requirements.txt --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0dd71c1..ea6934c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -57,4 +57,5 @@ zopfli==0.1.9 django-autologin django-summernote django-jazzmin -django-default-language \ No newline at end of file +django-default-language +gunicorn \ No newline at end of file From bcd74b2675e23301d53d79944d140bdb5f46c5e7 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 07:08:10 +0000 Subject: [PATCH 13/17] Actualiser requirements.txt --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ea6934c..451e75b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -58,4 +58,5 @@ django-autologin django-summernote django-jazzmin django-default-language -gunicorn \ No newline at end of file +gunicorn +whitenoise \ No newline at end of file From 540916650995517bd62019917ae9ce97df8bbb1e Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 07:09:40 +0000 Subject: [PATCH 14/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index f5c0552..53edc06 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -104,6 +104,7 @@ DATA_UPLOAD_MAX_NUMBER_FIELDS = 2500 MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', + 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', From 993ad598be9f40400dad41d6c3682cb82991fd62 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 07:11:04 +0000 Subject: [PATCH 15/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 53edc06..1abd83d 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -205,7 +205,7 @@ USE_L10N = False # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.0/howto/static-files/ -STATIC_URL = 'https://statics.ambulance-clerc.ch/static/' +STATIC_URL = '/static/' STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), @@ -383,6 +383,11 @@ JAZZMIN_UI_TWEAKS = { }, } + +# Simplified static file serving. +# https://pypi.org/project/whitenoise/ +STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' + if cfg_dev_mode: NEXTCLOUD_HOST = "cloud.ambulance-clerc.ch" else: From 838795647bfc3d5b48f87e35559cdb9ce7508118 Mon Sep 17 00:00:00 2001 From: Brocas Mathieu Date: Sat, 12 Aug 2023 07:20:38 +0000 Subject: [PATCH 16/17] Actualiser Reskreen/settings.py --- Reskreen/settings.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 1abd83d..fbb2f5a 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -21,8 +21,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-j4jd&+4j^t_=@zr(#q@n!8e*58vkql6&_6w-t14ju8pw%ei%^s' + # SECURITY WARNING: don't run with debug turned on in production! DEBUG = cfg_dev_mode From e06b299c641217204b88389bc4875f34ea74a78d Mon Sep 17 00:00:00 2001 From: brocasm Date: Sun, 10 Sep 2023 21:22:10 +0200 Subject: [PATCH 17/17] Changement sur le requirements.txt --- .gitignore | 3 ++- requirements.txt | 12 +++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ef3880d..0c9d551 100644 --- a/.gitignore +++ b/.gitignore @@ -361,7 +361,8 @@ MigrationBackup/ # Fody - auto-generated XML schema FodyWeavers.xsd -/venv/ +venv* +.venv-main* Reskreen/server_config.py ./db.sqlite3 diff --git a/requirements.txt b/requirements.txt index 451e75b..a33f86c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ arabic-reshaper==2.1.3 -asgiref==3.4.1 +asgiref==3.7.2 asn1crypto==1.5.1 Brotli==1.0.9 caldav==0.9.1 @@ -10,17 +10,15 @@ click==8.1.3 colorama==0.4.4 cryptography==37.0.1 cssselect2==0.4.1 -Django==4.0 -django-admin-rangefilter==0.8.3 -django-baton==2.2.3 -fonttools==4.29.1 +Django +django-admin-rangefilter fpdf==1.7.2 future==0.18.2 html5lib==1.1 icalendar==4.0.9 idna==3.3 -lxml==4.8.0 -mysqlclient==2.1.0 +lxml +# mysqlclient==2.1.0 oscrypto==1.3.0 pdfkit==1.0.0 Pillow==9.0.1