From 157776b35d9191981d6ff25b52ef4f42ddf550db Mon Sep 17 00:00:00 2001 From: Fred Date: Sun, 27 Dec 2020 19:35:26 +0100 Subject: [PATCH] Move files and folder for coherence --- source/part-2-deployment/_main.adoc | 2 -- source/part-2-deployment/debian.adoc | 12 +++++++----- source/part-2-deployment/heroku.adoc | 2 +- source/part-4-go-live/_index.adoc | 4 ++-- .../part-4-go-live/{gwift.adoc => gwift/_main.adoc} | 4 ---- source/{ => part-4-go-live}/gwift/models.adoc | 0 source/{ => part-4-go-live}/gwift/refactoring.adoc | 0 source/{ => part-4-go-live}/gwift/specs.adoc | 0 source/{ => part-4-go-live}/gwift/tests.adoc | 0 .../{ => part-4-go-live}/gwift/user-management.adoc | 0 .../part-4-go-live/{khana.adoc => khana/_main.adoc} | 0 11 files changed, 10 insertions(+), 14 deletions(-) rename source/part-4-go-live/{gwift.adoc => gwift/_main.adoc} (79%) rename source/{ => part-4-go-live}/gwift/models.adoc (100%) rename source/{ => part-4-go-live}/gwift/refactoring.adoc (100%) rename source/{ => part-4-go-live}/gwift/specs.adoc (100%) rename source/{ => part-4-go-live}/gwift/tests.adoc (100%) rename source/{ => part-4-go-live}/gwift/user-management.adoc (100%) rename source/part-4-go-live/{khana.adoc => khana/_main.adoc} (100%) diff --git a/source/part-2-deployment/_main.adoc b/source/part-2-deployment/_main.adoc index 79b70e5..60167ae 100644 --- a/source/part-2-deployment/_main.adoc +++ b/source/part-2-deployment/_main.adoc @@ -79,8 +79,6 @@ La machine hôte peut être louée chez Digital Ocean, Scaleway, OVH, Vultr, ... include::debian.adoc[] -include::ansible.adoc[] - include::heroku.adoc[] include::docker.adoc[] diff --git a/source/part-2-deployment/debian.adoc b/source/part-2-deployment/debian.adoc index 2bae1e8..c053801 100644 --- a/source/part-2-deployment/debian.adoc +++ b/source/part-2-deployment/debian.adoc @@ -322,7 +322,7 @@ server { gzip_types gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml; - location /static/ { <2> + location /static/ { <1> access_log off; expires 30d; add_header Pragma public; @@ -332,7 +332,7 @@ server { } location / { - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; <3> + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; <2> proxy_set_header Host $http_host; proxy_redirect off; @@ -340,8 +340,8 @@ server { } } ---- -<2> Ce répertoire sera complété par la commande `collectstatic` que l'on verra plus tard. L'objectif est que les fichiers ne demandant aucune intelligence soit directement servis par Nginx. Cela évite d'avoir un processus Python (relativement lent) qui doive être instancié pour servir un simple fichier statique. -<3> Afin d'éviter que Django ne reçoive uniquement des requêtes provenant de 127.0.0.1 +<1> Ce répertoire sera complété par la commande `collectstatic` que l'on verra plus tard. L'objectif est que les fichiers ne demandant aucune intelligence soit directement servis par Nginx. Cela évite d'avoir un processus Python (relativement lent) qui doive être instancié pour servir un simple fichier statique. +<2> Afin d'éviter que Django ne reçoive uniquement des requêtes provenant de 127.0.0.1 ==== Mise à jour @@ -395,4 +395,6 @@ Et dans le fichier crontab : Puis on démarre logrotate avec # logrotate -d /etc/logrotate.d/gwift pour vérifier que cela fonctionne correctement. -==== Ansible \ No newline at end of file +==== Ansible + +TODO diff --git a/source/part-2-deployment/heroku.adoc b/source/part-2-deployment/heroku.adoc index 0c89bf1..af44518 100644 --- a/source/part-2-deployment/heroku.adoc +++ b/source/part-2-deployment/heroku.adoc @@ -67,7 +67,7 @@ https://young-temple-86098.herokuapp.com/ | https://git.heroku.com/young-temple- ---- .Notre application est à présent configurée! -image::images/deployment/heroku-new-app-created.png[] +image::images/deployment/heroku-app-created.png[] Ajoutons lui une base de données, que nous sauvegarderons à intervalle régulier: diff --git a/source/part-4-go-live/_index.adoc b/source/part-4-go-live/_index.adoc index 82ef172..55b405c 100644 --- a/source/part-4-go-live/_index.adoc +++ b/source/part-4-go-live/_index.adoc @@ -10,6 +10,6 @@ La première chose à faire est de définir nos besoins du point de vue de l'uti Ensuite, nous pourrons traduire ces besoins en fonctionnalités et finalement effectuer le développement. -include::gwift.adoc[] +include::gwift/_main.adoc[] -include::khana.adoc[] \ No newline at end of file +include::khana/_main.adoc[] diff --git a/source/part-4-go-live/gwift.adoc b/source/part-4-go-live/gwift/_main.adoc similarity index 79% rename from source/part-4-go-live/gwift.adoc rename to source/part-4-go-live/gwift/_main.adoc index e6215f0..dd92589 100644 --- a/source/part-4-go-live/gwift.adoc +++ b/source/part-4-go-live/gwift/_main.adoc @@ -9,10 +9,6 @@ include::models.adoc[] include::tests.adoc[] -include::key-points.adoc[] - include::refactoring.adoc[] include::user-management.adoc[] - -include::console.adoc[] diff --git a/source/gwift/models.adoc b/source/part-4-go-live/gwift/models.adoc similarity index 100% rename from source/gwift/models.adoc rename to source/part-4-go-live/gwift/models.adoc diff --git a/source/gwift/refactoring.adoc b/source/part-4-go-live/gwift/refactoring.adoc similarity index 100% rename from source/gwift/refactoring.adoc rename to source/part-4-go-live/gwift/refactoring.adoc diff --git a/source/gwift/specs.adoc b/source/part-4-go-live/gwift/specs.adoc similarity index 100% rename from source/gwift/specs.adoc rename to source/part-4-go-live/gwift/specs.adoc diff --git a/source/gwift/tests.adoc b/source/part-4-go-live/gwift/tests.adoc similarity index 100% rename from source/gwift/tests.adoc rename to source/part-4-go-live/gwift/tests.adoc diff --git a/source/gwift/user-management.adoc b/source/part-4-go-live/gwift/user-management.adoc similarity index 100% rename from source/gwift/user-management.adoc rename to source/part-4-go-live/gwift/user-management.adoc diff --git a/source/part-4-go-live/khana.adoc b/source/part-4-go-live/khana/_main.adoc similarity index 100% rename from source/part-4-go-live/khana.adoc rename to source/part-4-go-live/khana/_main.adoc