From d8bd75003ba5af45901ee355a00ba8f5a4d9cf3a Mon Sep 17 00:00:00 2001 From: Arthur Date: Tue, 25 Feb 2025 18:24:29 +0100 Subject: [PATCH] no more apache2 --- apache2/004-django.conf | 26 ------------------ docker-compose.yaml | 14 ++++++++++ {django_app => sciodog-app}/.gitignore | 0 sciodog-app/Dockerfile | 21 ++++++++++++++ .../app}/blog/__init__.py | 0 {django_app => sciodog-app/app}/blog/admin.py | 0 {django_app => sciodog-app/app}/blog/apps.py | 0 .../app}/blog/migrations/0001_initial.py | 0 .../app}/blog/migrations/__init__.py | 0 .../app}/blog/models.py | 0 .../app}/blog/static/blog/favicon.ico | Bin .../app}/blog/static/blog/fonts/Montserat.ttf | Bin .../static/blog/fonts/Montserrat-Medium.woff | Bin .../static/blog/fonts/THSarabunNew Bold.woff | Bin .../blog/fonts/THSarabunNew BoldItalic.woff | Bin .../blog/fonts/THSarabunNew Italic.woff | Bin .../blog/static/blog/fonts/THSarabunNew.woff | Bin .../blog/static/blog/images/LinkedIn_logo.png | Bin .../blog/static/blog/images/Obeissance.jpeg | Bin .../app}/blog/static/blog/images/avis.png | Bin .../app}/blog/static/blog/images/avis2.png | Bin .../blog/static/blog/images/bebe_scio.jpg | Bin .../blog/static/blog/images/bebe_scio.png | Bin .../static/blog/images/bebe_scio_floue.jpg | Bin .../carousel/France_Bleu_Cotentin_2021.png | Bin .../static/blog/images/carousel/Tom&Co.png | Bin .../static/blog/images/carousel/avis1.png | Bin .../static/blog/images/carousel/avis2.png | Bin .../static/blog/images/carousel/avis3.png | Bin .../static/blog/images/carousel/clinique.png | Bin .../blog/images/carousel/les_cotentinois.png | Bin .../images/carousel/les_cotentinois_500.png | Bin .../blog/images/carousel/logo-radio-flam.png | Bin .../blog/static/blog/images/checker_linux | Bin .../blog/images/clinique_bricquebec.png | Bin .../app}/blog/static/blog/images/cover.jpeg | Bin .../app}/blog/static/blog/images/cover2.jpeg | Bin .../blog/static/blog/images/educdog_logo.png | Bin .../static/blog/images/facilitepaiement.png | Bin .../app}/blog/static/blog/images/fb-logo.png | Bin .../blog/static/blog/images/fbcotentin.jpeg | Bin .../blog/images/france_bleu_contentin.png | Bin .../app}/blog/static/blog/images/help-dog.png | Bin .../blog/static/blog/images/insta-logo.png | Bin .../static/blog/images/linkedin_logo.webp | Bin .../blog/static/blog/images/locki-logo1.jpg | Bin .../static/blog/images/locki-paysage2.jpg | Bin .../app}/blog/static/blog/images/loisir.jpg | Bin .../blog/static/blog/images/loki-logo1.jpg | Bin .../static/blog/images/minilibx-linux.tgz | Bin .../static/blog/images/minilibx_mms_beta.tgz | Bin .../static/blog/images/minilibx_opengl.tgz | Bin .../blog/static/blog/images/radioflamm.png | Bin .../app}/blog/static/blog/images/scio.png | Bin .../app}/blog/static/blog/images/scio1.jpg | Bin .../blog/static/blog/images/scioPlage.png | Bin .../blog/static/blog/images/scio_travaux.jpg | Bin .../app}/blog/static/blog/main.css | 0 .../blog/static/blog/posts/557083417106020 | Bin .../blog/static/blog/posts/571406679007027 | Bin .../blog/static/blog/posts/585718547575840 | Bin .../blog/templates/blog/article_detail.html | 0 .../blog/templates/blog/article_list.html | 0 .../app}/blog/templates/blog/index.html | 0 {django_app => sciodog-app/app}/blog/tests.py | 0 {django_app => sciodog-app/app}/blog/urls.py | 0 .../app}/blog/views/__init__.py | 0 .../app}/blog/views/articles_detail.py | 0 .../app}/blog/views/articles_list.py | 0 .../app}/blog/views/index.py | 0 {django_app => sciodog-app/app}/manage.py | 0 .../app}/requirements.txt | 1 + .../app}/sciodog/__init__.py | 0 .../app}/sciodog/asgi.py | 0 .../app}/sciodog/settings.py | 2 +- .../app}/sciodog/urls.py | 0 .../app}/sciodog/wsgi.py | 0 sciodog-app/configuration/test.py | 5 ++++ sciodog-app/configuration/uwsgi.ini | 10 +++++++ 79 files changed, 52 insertions(+), 27 deletions(-) delete mode 100644 apache2/004-django.conf create mode 100644 docker-compose.yaml rename {django_app => sciodog-app}/.gitignore (100%) create mode 100644 sciodog-app/Dockerfile rename {django_app => sciodog-app/app}/blog/__init__.py (100%) rename {django_app => sciodog-app/app}/blog/admin.py (100%) rename {django_app => sciodog-app/app}/blog/apps.py (100%) rename {django_app => sciodog-app/app}/blog/migrations/0001_initial.py (100%) rename {django_app => sciodog-app/app}/blog/migrations/__init__.py (100%) rename {django_app => sciodog-app/app}/blog/models.py (100%) rename {django_app => sciodog-app/app}/blog/static/blog/favicon.ico (100%) rename {django_app => sciodog-app/app}/blog/static/blog/fonts/Montserat.ttf (100%) rename {django_app => sciodog-app/app}/blog/static/blog/fonts/Montserrat-Medium.woff (100%) rename {django_app => sciodog-app/app}/blog/static/blog/fonts/THSarabunNew Bold.woff (100%) rename {django_app => sciodog-app/app}/blog/static/blog/fonts/THSarabunNew BoldItalic.woff (100%) rename {django_app => sciodog-app/app}/blog/static/blog/fonts/THSarabunNew Italic.woff (100%) rename {django_app => sciodog-app/app}/blog/static/blog/fonts/THSarabunNew.woff (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/LinkedIn_logo.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/Obeissance.jpeg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/avis.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/avis2.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/bebe_scio.jpg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/bebe_scio.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/bebe_scio_floue.jpg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/France_Bleu_Cotentin_2021.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/Tom&Co.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/avis1.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/avis2.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/avis3.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/clinique.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/les_cotentinois.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/les_cotentinois_500.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/carousel/logo-radio-flam.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/checker_linux (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/clinique_bricquebec.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/cover.jpeg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/cover2.jpeg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/educdog_logo.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/facilitepaiement.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/fb-logo.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/fbcotentin.jpeg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/france_bleu_contentin.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/help-dog.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/insta-logo.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/linkedin_logo.webp (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/locki-logo1.jpg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/locki-paysage2.jpg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/loisir.jpg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/loki-logo1.jpg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/minilibx-linux.tgz (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/minilibx_mms_beta.tgz (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/minilibx_opengl.tgz (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/radioflamm.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/scio.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/scio1.jpg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/scioPlage.png (100%) rename {django_app => sciodog-app/app}/blog/static/blog/images/scio_travaux.jpg (100%) rename {django_app => sciodog-app/app}/blog/static/blog/main.css (100%) rename {django_app => sciodog-app/app}/blog/static/blog/posts/557083417106020 (100%) rename {django_app => sciodog-app/app}/blog/static/blog/posts/571406679007027 (100%) rename {django_app => sciodog-app/app}/blog/static/blog/posts/585718547575840 (100%) rename {django_app => sciodog-app/app}/blog/templates/blog/article_detail.html (100%) rename {django_app => sciodog-app/app}/blog/templates/blog/article_list.html (100%) rename {django_app => sciodog-app/app}/blog/templates/blog/index.html (100%) rename {django_app => sciodog-app/app}/blog/tests.py (100%) rename {django_app => sciodog-app/app}/blog/urls.py (100%) rename {django_app => sciodog-app/app}/blog/views/__init__.py (100%) rename {django_app => sciodog-app/app}/blog/views/articles_detail.py (100%) rename {django_app => sciodog-app/app}/blog/views/articles_list.py (100%) rename {django_app => sciodog-app/app}/blog/views/index.py (100%) rename {django_app => sciodog-app/app}/manage.py (100%) rename {django_app => sciodog-app/app}/requirements.txt (86%) rename {django_app => sciodog-app/app}/sciodog/__init__.py (100%) rename {django_app => sciodog-app/app}/sciodog/asgi.py (100%) rename {django_app => sciodog-app/app}/sciodog/settings.py (98%) rename {django_app => sciodog-app/app}/sciodog/urls.py (100%) rename {django_app => sciodog-app/app}/sciodog/wsgi.py (100%) create mode 100644 sciodog-app/configuration/test.py create mode 100644 sciodog-app/configuration/uwsgi.ini diff --git a/apache2/004-django.conf b/apache2/004-django.conf deleted file mode 100644 index 7ae1720..0000000 --- a/apache2/004-django.conf +++ /dev/null @@ -1,26 +0,0 @@ -WSGIScriptAlias / /var/www/sciodog.fr/sciodog/wsgi.py -WSGIPythonHome /var/www/sciodog.fr/venv -WSGIPythonPath /var/www/sciodog.fr - -LoadModule wsgi_module /usr/lib/apache2/modules/mod_wsgi.so -Alias /static /var/www/sciodog.fr/blog/static/ - - - Require all granted - - - - ServerName sciodog.fr - - - - Require all granted - - - LogLevel info - ErrorLog /var/log/apache2/django-error.log - CustomLog /var/log/apache2/django-access.log combined -RewriteEngine on -RewriteCond %{SERVER_NAME} =sciodog.fr -RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] - diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..785c600 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,14 @@ +services: + sciodog: + build: + context: sciodog-app + dockerfile: Dockerfile + environment: + WSGI_FILE: "sciodog.wsgi" + HOSTNAME: "sciodog.fr" + PORT: 80 + restart: always + healthcheck: + test: "wget -O/dev/null -q http://127.0.0.1/" + interval: 0.5s + retries: 30 diff --git a/django_app/.gitignore b/sciodog-app/.gitignore similarity index 100% rename from django_app/.gitignore rename to sciodog-app/.gitignore diff --git a/sciodog-app/Dockerfile b/sciodog-app/Dockerfile new file mode 100644 index 0000000..8db743b --- /dev/null +++ b/sciodog-app/Dockerfile @@ -0,0 +1,21 @@ +# WSGI_FILE : file used as the app to run, passed to uwsgi --module option +# PORT : Port on which the app is exposed +# APP_DIR : Path of the app on the host machine. It will be mounted on /var/www/html in the container + +FROM alpine:latest + +# UWSGI Configuration +COPY configuration/ /etc/uwsgi/ +RUN mkdir -p /etc/uwsgi ; \ + adduser uwsgi -S -D -H -s /usr/sbin/nologin ; \ + apk add python3 python3-dev py3-pip gcc musl-dev linux-headers ; \ + pip install --break-system-packages uwsgi django + +# Application configuration +WORKDIR /var/www/html +COPY ./app/ . +RUN pip install --break-system-packages -r requirements.txt + +EXPOSE ${PORT} + +ENTRYPOINT ["uwsgi", "--ini", "/etc/uwsgi/uwsgi.ini"] diff --git a/django_app/blog/__init__.py b/sciodog-app/app/blog/__init__.py similarity index 100% rename from django_app/blog/__init__.py rename to sciodog-app/app/blog/__init__.py diff --git a/django_app/blog/admin.py b/sciodog-app/app/blog/admin.py similarity index 100% rename from django_app/blog/admin.py rename to sciodog-app/app/blog/admin.py diff --git a/django_app/blog/apps.py b/sciodog-app/app/blog/apps.py similarity index 100% rename from django_app/blog/apps.py rename to sciodog-app/app/blog/apps.py diff --git a/django_app/blog/migrations/0001_initial.py b/sciodog-app/app/blog/migrations/0001_initial.py similarity index 100% rename from django_app/blog/migrations/0001_initial.py rename to sciodog-app/app/blog/migrations/0001_initial.py diff --git a/django_app/blog/migrations/__init__.py b/sciodog-app/app/blog/migrations/__init__.py similarity index 100% rename from django_app/blog/migrations/__init__.py rename to sciodog-app/app/blog/migrations/__init__.py diff --git a/django_app/blog/models.py b/sciodog-app/app/blog/models.py similarity index 100% rename from django_app/blog/models.py rename to sciodog-app/app/blog/models.py diff --git a/django_app/blog/static/blog/favicon.ico b/sciodog-app/app/blog/static/blog/favicon.ico similarity index 100% rename from django_app/blog/static/blog/favicon.ico rename to sciodog-app/app/blog/static/blog/favicon.ico diff --git a/django_app/blog/static/blog/fonts/Montserat.ttf b/sciodog-app/app/blog/static/blog/fonts/Montserat.ttf similarity index 100% rename from django_app/blog/static/blog/fonts/Montserat.ttf rename to sciodog-app/app/blog/static/blog/fonts/Montserat.ttf diff --git a/django_app/blog/static/blog/fonts/Montserrat-Medium.woff b/sciodog-app/app/blog/static/blog/fonts/Montserrat-Medium.woff similarity index 100% rename from django_app/blog/static/blog/fonts/Montserrat-Medium.woff rename to sciodog-app/app/blog/static/blog/fonts/Montserrat-Medium.woff diff --git a/django_app/blog/static/blog/fonts/THSarabunNew Bold.woff b/sciodog-app/app/blog/static/blog/fonts/THSarabunNew Bold.woff similarity index 100% rename from django_app/blog/static/blog/fonts/THSarabunNew Bold.woff rename to sciodog-app/app/blog/static/blog/fonts/THSarabunNew Bold.woff diff --git a/django_app/blog/static/blog/fonts/THSarabunNew BoldItalic.woff b/sciodog-app/app/blog/static/blog/fonts/THSarabunNew BoldItalic.woff similarity index 100% rename from django_app/blog/static/blog/fonts/THSarabunNew BoldItalic.woff rename to sciodog-app/app/blog/static/blog/fonts/THSarabunNew BoldItalic.woff diff --git a/django_app/blog/static/blog/fonts/THSarabunNew Italic.woff b/sciodog-app/app/blog/static/blog/fonts/THSarabunNew Italic.woff similarity index 100% rename from django_app/blog/static/blog/fonts/THSarabunNew Italic.woff rename to sciodog-app/app/blog/static/blog/fonts/THSarabunNew Italic.woff diff --git a/django_app/blog/static/blog/fonts/THSarabunNew.woff b/sciodog-app/app/blog/static/blog/fonts/THSarabunNew.woff similarity index 100% rename from django_app/blog/static/blog/fonts/THSarabunNew.woff rename to sciodog-app/app/blog/static/blog/fonts/THSarabunNew.woff diff --git a/django_app/blog/static/blog/images/LinkedIn_logo.png b/sciodog-app/app/blog/static/blog/images/LinkedIn_logo.png similarity index 100% rename from django_app/blog/static/blog/images/LinkedIn_logo.png rename to sciodog-app/app/blog/static/blog/images/LinkedIn_logo.png diff --git a/django_app/blog/static/blog/images/Obeissance.jpeg b/sciodog-app/app/blog/static/blog/images/Obeissance.jpeg similarity index 100% rename from django_app/blog/static/blog/images/Obeissance.jpeg rename to sciodog-app/app/blog/static/blog/images/Obeissance.jpeg diff --git a/django_app/blog/static/blog/images/avis.png b/sciodog-app/app/blog/static/blog/images/avis.png similarity index 100% rename from django_app/blog/static/blog/images/avis.png rename to sciodog-app/app/blog/static/blog/images/avis.png diff --git a/django_app/blog/static/blog/images/avis2.png b/sciodog-app/app/blog/static/blog/images/avis2.png similarity index 100% rename from django_app/blog/static/blog/images/avis2.png rename to sciodog-app/app/blog/static/blog/images/avis2.png diff --git a/django_app/blog/static/blog/images/bebe_scio.jpg b/sciodog-app/app/blog/static/blog/images/bebe_scio.jpg similarity index 100% rename from django_app/blog/static/blog/images/bebe_scio.jpg rename to sciodog-app/app/blog/static/blog/images/bebe_scio.jpg diff --git a/django_app/blog/static/blog/images/bebe_scio.png b/sciodog-app/app/blog/static/blog/images/bebe_scio.png similarity index 100% rename from django_app/blog/static/blog/images/bebe_scio.png rename to sciodog-app/app/blog/static/blog/images/bebe_scio.png diff --git a/django_app/blog/static/blog/images/bebe_scio_floue.jpg b/sciodog-app/app/blog/static/blog/images/bebe_scio_floue.jpg similarity index 100% rename from django_app/blog/static/blog/images/bebe_scio_floue.jpg rename to sciodog-app/app/blog/static/blog/images/bebe_scio_floue.jpg diff --git a/django_app/blog/static/blog/images/carousel/France_Bleu_Cotentin_2021.png b/sciodog-app/app/blog/static/blog/images/carousel/France_Bleu_Cotentin_2021.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/France_Bleu_Cotentin_2021.png rename to sciodog-app/app/blog/static/blog/images/carousel/France_Bleu_Cotentin_2021.png diff --git a/django_app/blog/static/blog/images/carousel/Tom&Co.png b/sciodog-app/app/blog/static/blog/images/carousel/Tom&Co.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/Tom&Co.png rename to sciodog-app/app/blog/static/blog/images/carousel/Tom&Co.png diff --git a/django_app/blog/static/blog/images/carousel/avis1.png b/sciodog-app/app/blog/static/blog/images/carousel/avis1.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/avis1.png rename to sciodog-app/app/blog/static/blog/images/carousel/avis1.png diff --git a/django_app/blog/static/blog/images/carousel/avis2.png b/sciodog-app/app/blog/static/blog/images/carousel/avis2.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/avis2.png rename to sciodog-app/app/blog/static/blog/images/carousel/avis2.png diff --git a/django_app/blog/static/blog/images/carousel/avis3.png b/sciodog-app/app/blog/static/blog/images/carousel/avis3.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/avis3.png rename to sciodog-app/app/blog/static/blog/images/carousel/avis3.png diff --git a/django_app/blog/static/blog/images/carousel/clinique.png b/sciodog-app/app/blog/static/blog/images/carousel/clinique.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/clinique.png rename to sciodog-app/app/blog/static/blog/images/carousel/clinique.png diff --git a/django_app/blog/static/blog/images/carousel/les_cotentinois.png b/sciodog-app/app/blog/static/blog/images/carousel/les_cotentinois.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/les_cotentinois.png rename to sciodog-app/app/blog/static/blog/images/carousel/les_cotentinois.png diff --git a/django_app/blog/static/blog/images/carousel/les_cotentinois_500.png b/sciodog-app/app/blog/static/blog/images/carousel/les_cotentinois_500.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/les_cotentinois_500.png rename to sciodog-app/app/blog/static/blog/images/carousel/les_cotentinois_500.png diff --git a/django_app/blog/static/blog/images/carousel/logo-radio-flam.png b/sciodog-app/app/blog/static/blog/images/carousel/logo-radio-flam.png similarity index 100% rename from django_app/blog/static/blog/images/carousel/logo-radio-flam.png rename to sciodog-app/app/blog/static/blog/images/carousel/logo-radio-flam.png diff --git a/django_app/blog/static/blog/images/checker_linux b/sciodog-app/app/blog/static/blog/images/checker_linux similarity index 100% rename from django_app/blog/static/blog/images/checker_linux rename to sciodog-app/app/blog/static/blog/images/checker_linux diff --git a/django_app/blog/static/blog/images/clinique_bricquebec.png b/sciodog-app/app/blog/static/blog/images/clinique_bricquebec.png similarity index 100% rename from django_app/blog/static/blog/images/clinique_bricquebec.png rename to sciodog-app/app/blog/static/blog/images/clinique_bricquebec.png diff --git a/django_app/blog/static/blog/images/cover.jpeg b/sciodog-app/app/blog/static/blog/images/cover.jpeg similarity index 100% rename from django_app/blog/static/blog/images/cover.jpeg rename to sciodog-app/app/blog/static/blog/images/cover.jpeg diff --git a/django_app/blog/static/blog/images/cover2.jpeg b/sciodog-app/app/blog/static/blog/images/cover2.jpeg similarity index 100% rename from django_app/blog/static/blog/images/cover2.jpeg rename to sciodog-app/app/blog/static/blog/images/cover2.jpeg diff --git a/django_app/blog/static/blog/images/educdog_logo.png b/sciodog-app/app/blog/static/blog/images/educdog_logo.png similarity index 100% rename from django_app/blog/static/blog/images/educdog_logo.png rename to sciodog-app/app/blog/static/blog/images/educdog_logo.png diff --git a/django_app/blog/static/blog/images/facilitepaiement.png b/sciodog-app/app/blog/static/blog/images/facilitepaiement.png similarity index 100% rename from django_app/blog/static/blog/images/facilitepaiement.png rename to sciodog-app/app/blog/static/blog/images/facilitepaiement.png diff --git a/django_app/blog/static/blog/images/fb-logo.png b/sciodog-app/app/blog/static/blog/images/fb-logo.png similarity index 100% rename from django_app/blog/static/blog/images/fb-logo.png rename to sciodog-app/app/blog/static/blog/images/fb-logo.png diff --git a/django_app/blog/static/blog/images/fbcotentin.jpeg b/sciodog-app/app/blog/static/blog/images/fbcotentin.jpeg similarity index 100% rename from django_app/blog/static/blog/images/fbcotentin.jpeg rename to sciodog-app/app/blog/static/blog/images/fbcotentin.jpeg diff --git a/django_app/blog/static/blog/images/france_bleu_contentin.png b/sciodog-app/app/blog/static/blog/images/france_bleu_contentin.png similarity index 100% rename from django_app/blog/static/blog/images/france_bleu_contentin.png rename to sciodog-app/app/blog/static/blog/images/france_bleu_contentin.png diff --git a/django_app/blog/static/blog/images/help-dog.png b/sciodog-app/app/blog/static/blog/images/help-dog.png similarity index 100% rename from django_app/blog/static/blog/images/help-dog.png rename to sciodog-app/app/blog/static/blog/images/help-dog.png diff --git a/django_app/blog/static/blog/images/insta-logo.png b/sciodog-app/app/blog/static/blog/images/insta-logo.png similarity index 100% rename from django_app/blog/static/blog/images/insta-logo.png rename to sciodog-app/app/blog/static/blog/images/insta-logo.png diff --git a/django_app/blog/static/blog/images/linkedin_logo.webp b/sciodog-app/app/blog/static/blog/images/linkedin_logo.webp similarity index 100% rename from django_app/blog/static/blog/images/linkedin_logo.webp rename to sciodog-app/app/blog/static/blog/images/linkedin_logo.webp diff --git a/django_app/blog/static/blog/images/locki-logo1.jpg b/sciodog-app/app/blog/static/blog/images/locki-logo1.jpg similarity index 100% rename from django_app/blog/static/blog/images/locki-logo1.jpg rename to sciodog-app/app/blog/static/blog/images/locki-logo1.jpg diff --git a/django_app/blog/static/blog/images/locki-paysage2.jpg b/sciodog-app/app/blog/static/blog/images/locki-paysage2.jpg similarity index 100% rename from django_app/blog/static/blog/images/locki-paysage2.jpg rename to sciodog-app/app/blog/static/blog/images/locki-paysage2.jpg diff --git a/django_app/blog/static/blog/images/loisir.jpg b/sciodog-app/app/blog/static/blog/images/loisir.jpg similarity index 100% rename from django_app/blog/static/blog/images/loisir.jpg rename to sciodog-app/app/blog/static/blog/images/loisir.jpg diff --git a/django_app/blog/static/blog/images/loki-logo1.jpg b/sciodog-app/app/blog/static/blog/images/loki-logo1.jpg similarity index 100% rename from django_app/blog/static/blog/images/loki-logo1.jpg rename to sciodog-app/app/blog/static/blog/images/loki-logo1.jpg diff --git a/django_app/blog/static/blog/images/minilibx-linux.tgz b/sciodog-app/app/blog/static/blog/images/minilibx-linux.tgz similarity index 100% rename from django_app/blog/static/blog/images/minilibx-linux.tgz rename to sciodog-app/app/blog/static/blog/images/minilibx-linux.tgz diff --git a/django_app/blog/static/blog/images/minilibx_mms_beta.tgz b/sciodog-app/app/blog/static/blog/images/minilibx_mms_beta.tgz similarity index 100% rename from django_app/blog/static/blog/images/minilibx_mms_beta.tgz rename to sciodog-app/app/blog/static/blog/images/minilibx_mms_beta.tgz diff --git a/django_app/blog/static/blog/images/minilibx_opengl.tgz b/sciodog-app/app/blog/static/blog/images/minilibx_opengl.tgz similarity index 100% rename from django_app/blog/static/blog/images/minilibx_opengl.tgz rename to sciodog-app/app/blog/static/blog/images/minilibx_opengl.tgz diff --git a/django_app/blog/static/blog/images/radioflamm.png b/sciodog-app/app/blog/static/blog/images/radioflamm.png similarity index 100% rename from django_app/blog/static/blog/images/radioflamm.png rename to sciodog-app/app/blog/static/blog/images/radioflamm.png diff --git a/django_app/blog/static/blog/images/scio.png b/sciodog-app/app/blog/static/blog/images/scio.png similarity index 100% rename from django_app/blog/static/blog/images/scio.png rename to sciodog-app/app/blog/static/blog/images/scio.png diff --git a/django_app/blog/static/blog/images/scio1.jpg b/sciodog-app/app/blog/static/blog/images/scio1.jpg similarity index 100% rename from django_app/blog/static/blog/images/scio1.jpg rename to sciodog-app/app/blog/static/blog/images/scio1.jpg diff --git a/django_app/blog/static/blog/images/scioPlage.png b/sciodog-app/app/blog/static/blog/images/scioPlage.png similarity index 100% rename from django_app/blog/static/blog/images/scioPlage.png rename to sciodog-app/app/blog/static/blog/images/scioPlage.png diff --git a/django_app/blog/static/blog/images/scio_travaux.jpg b/sciodog-app/app/blog/static/blog/images/scio_travaux.jpg similarity index 100% rename from django_app/blog/static/blog/images/scio_travaux.jpg rename to sciodog-app/app/blog/static/blog/images/scio_travaux.jpg diff --git a/django_app/blog/static/blog/main.css b/sciodog-app/app/blog/static/blog/main.css similarity index 100% rename from django_app/blog/static/blog/main.css rename to sciodog-app/app/blog/static/blog/main.css diff --git a/django_app/blog/static/blog/posts/557083417106020 b/sciodog-app/app/blog/static/blog/posts/557083417106020 similarity index 100% rename from django_app/blog/static/blog/posts/557083417106020 rename to sciodog-app/app/blog/static/blog/posts/557083417106020 diff --git a/django_app/blog/static/blog/posts/571406679007027 b/sciodog-app/app/blog/static/blog/posts/571406679007027 similarity index 100% rename from django_app/blog/static/blog/posts/571406679007027 rename to sciodog-app/app/blog/static/blog/posts/571406679007027 diff --git a/django_app/blog/static/blog/posts/585718547575840 b/sciodog-app/app/blog/static/blog/posts/585718547575840 similarity index 100% rename from django_app/blog/static/blog/posts/585718547575840 rename to sciodog-app/app/blog/static/blog/posts/585718547575840 diff --git a/django_app/blog/templates/blog/article_detail.html b/sciodog-app/app/blog/templates/blog/article_detail.html similarity index 100% rename from django_app/blog/templates/blog/article_detail.html rename to sciodog-app/app/blog/templates/blog/article_detail.html diff --git a/django_app/blog/templates/blog/article_list.html b/sciodog-app/app/blog/templates/blog/article_list.html similarity index 100% rename from django_app/blog/templates/blog/article_list.html rename to sciodog-app/app/blog/templates/blog/article_list.html diff --git a/django_app/blog/templates/blog/index.html b/sciodog-app/app/blog/templates/blog/index.html similarity index 100% rename from django_app/blog/templates/blog/index.html rename to sciodog-app/app/blog/templates/blog/index.html diff --git a/django_app/blog/tests.py b/sciodog-app/app/blog/tests.py similarity index 100% rename from django_app/blog/tests.py rename to sciodog-app/app/blog/tests.py diff --git a/django_app/blog/urls.py b/sciodog-app/app/blog/urls.py similarity index 100% rename from django_app/blog/urls.py rename to sciodog-app/app/blog/urls.py diff --git a/django_app/blog/views/__init__.py b/sciodog-app/app/blog/views/__init__.py similarity index 100% rename from django_app/blog/views/__init__.py rename to sciodog-app/app/blog/views/__init__.py diff --git a/django_app/blog/views/articles_detail.py b/sciodog-app/app/blog/views/articles_detail.py similarity index 100% rename from django_app/blog/views/articles_detail.py rename to sciodog-app/app/blog/views/articles_detail.py diff --git a/django_app/blog/views/articles_list.py b/sciodog-app/app/blog/views/articles_list.py similarity index 100% rename from django_app/blog/views/articles_list.py rename to sciodog-app/app/blog/views/articles_list.py diff --git a/django_app/blog/views/index.py b/sciodog-app/app/blog/views/index.py similarity index 100% rename from django_app/blog/views/index.py rename to sciodog-app/app/blog/views/index.py diff --git a/django_app/manage.py b/sciodog-app/app/manage.py similarity index 100% rename from django_app/manage.py rename to sciodog-app/app/manage.py diff --git a/django_app/requirements.txt b/sciodog-app/app/requirements.txt similarity index 86% rename from django_app/requirements.txt rename to sciodog-app/app/requirements.txt index 24f59ba..d24031d 100644 --- a/django_app/requirements.txt +++ b/sciodog-app/app/requirements.txt @@ -1,3 +1,4 @@ django==4.2.7 python-dotenv==1.0.0 requests +tzdata diff --git a/django_app/sciodog/__init__.py b/sciodog-app/app/sciodog/__init__.py similarity index 100% rename from django_app/sciodog/__init__.py rename to sciodog-app/app/sciodog/__init__.py diff --git a/django_app/sciodog/asgi.py b/sciodog-app/app/sciodog/asgi.py similarity index 100% rename from django_app/sciodog/asgi.py rename to sciodog-app/app/sciodog/asgi.py diff --git a/django_app/sciodog/settings.py b/sciodog-app/app/sciodog/settings.py similarity index 98% rename from django_app/sciodog/settings.py rename to sciodog-app/app/sciodog/settings.py index 86736d2..51465e0 100644 --- a/django_app/sciodog/settings.py +++ b/sciodog-app/app/sciodog/settings.py @@ -29,7 +29,7 @@ SECRET_KEY = 'django-insecure-^cysot^fcha7(@k!3u5zf1-!in_&k^1-j1i@0yqi+k+vpda@s5 # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True #os.environ["DEBUG"] != None -ALLOWED_HOSTS = [os.environ["HOST"], "sciodog.fr"] +ALLOWED_HOSTS = [os.environ["HOSTNAME"], "sciodog.fr"] # Application definition diff --git a/django_app/sciodog/urls.py b/sciodog-app/app/sciodog/urls.py similarity index 100% rename from django_app/sciodog/urls.py rename to sciodog-app/app/sciodog/urls.py diff --git a/django_app/sciodog/wsgi.py b/sciodog-app/app/sciodog/wsgi.py similarity index 100% rename from django_app/sciodog/wsgi.py rename to sciodog-app/app/sciodog/wsgi.py diff --git a/sciodog-app/configuration/test.py b/sciodog-app/configuration/test.py new file mode 100644 index 0000000..43e35b4 --- /dev/null +++ b/sciodog-app/configuration/test.py @@ -0,0 +1,5 @@ +# test.py +def application(env, start_response): + start_response('200 OK', [('Content-Type','text/html')]) + return [b"Hello World"] # python3 + diff --git a/sciodog-app/configuration/uwsgi.ini b/sciodog-app/configuration/uwsgi.ini new file mode 100644 index 0000000..0e58053 --- /dev/null +++ b/sciodog-app/configuration/uwsgi.ini @@ -0,0 +1,10 @@ +[uwsgi] +chdir = /var/www/html +master = true +uid = uwsgi +logto = /var/log/uwsgi.log +http-socket = 0.0.0.0:$(PORT) +module = $(WSGI_FILE) +processes = 4 +threads = 2 +die-on-term = true