move certifs to nginx-proxy

.gitignore

@@ -15,6 +15,6 @@
 !/useruploaddata/.gitkeep
 !/.ssh/id_rsa_exploitation
 /docker/.idea
-/docker/nginx/certs/*
-!/docker/nginx/certs/ssl_keys.sh
+/docker/nginx-proxy/certs/*
+!/docker/nginx-proxy/certs/ssl_keys.sh
 .DS_Store

README.md

@@ -96,8 +96,8 @@ Pour permettre l'usage de l'HTTPS, il faut générer des certificats pour les do
 
 Lancer les commandes suivantes : 
 
-    chmod +x docker/nginx/certs/ssl_keys.sh
-    sh docker/nginx/certs/ssl_keys.sh
+    chmod +x docker/nginx-proxy/certs/ssl_keys.sh
+    sh docker/nginx-proxy/certs/ssl_keys.sh
 
 Vérifier ensuite la prise en compte des certificats:
 
@@ -408,10 +408,10 @@ Si les docker sont up, tout arrêter:
 
     docker-compose stop
 
-Ajouter les lignes suivantes au fichier docker/nginx/certs/ssl_keys.sh
+Ajouter les lignes suivantes au fichier docker/nginx-proxy/certs/ssl_keys.sh
 
-    cp docker/nginx/certs/default.key docker/nginx/certs/<my-domain.fr>.key
-    cp docker/nginx/certs/default.crt docker/nginx/certs/<my-domain.fr>.crt
+    cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/<my-domain.fr>.key
+    cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/<my-domain.fr>.crt
 
 en remplaçant `<my-domain.fr>` par le nom de domaine attendu.
 
@@ -419,7 +419,7 @@ Copier les deux fichiers nouvellement générés dans
 
 Exécuter le script depuis la racine du projet docker:
 
-    sh docker/nginx/certs/ssl_keys.sh
+    sh docker/nginx-proxy/certs/ssl_keys.sh
 
 Supprimer le docker nginx-proxy, puis rebuilder:
 

docker/nginx-proxy/Dockerfile

@@ -1,3 +1,3 @@
 FROM jwilder/nginx-proxy:alpine
 
-ADD /docker/nginx/certs /etc/nginx/certs
+ADD /docker/nginx-proxy/certs /etc/nginx/certs

docker/nginx-proxy/certs/ssl_keys.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+#a éxécuter dans le dossier certs.
+openssl genrsa -des3 -passout pass:NotSecure -out docker/nginx-proxy/certs/default.pass.key 2048
+openssl rsa -passin pass:NotSecure -in docker/nginx-proxy/certs/default.pass.key -out docker/nginx-proxy/certs/default.key
+rm docker/nginx-proxy/certs/default.pass.key
+openssl req -new -passout pass:NotSecure -key docker/nginx-proxy/certs/default.key -out docker/nginx-proxy/certs/default.csr  -subj '/C=SS/ST=SS/L=Cluses/O=Opentalent Dev/CN=localhost'
+openssl x509 -req -sha256 -days 365 -in docker/nginx-proxy/certs/default.csr -signkey docker/nginx-proxy/certs/default.key -out docker/nginx-proxy/certs/default.crt
+
+#adapter avec le sous domaine souhaité.
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.phpmyadmin.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.phpmyadmin.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.api.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.api.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.ap2i.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.ap2i.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.elasticsearch.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.elasticsearch.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.mailcatcher.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.mailcatcher.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.v59.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.v59.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.admin.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.admin.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.app.opentalent.fr.crt
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.app.opentalent.fr.key
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.thumbor.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.thumbor.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.sub.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.sub.opentalent.fr.crt
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.sub.customdomain.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.sub.customdomain.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.blackfire.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.blackfire.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.metabase.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.metabase.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.ap2i-doc.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.ap2i-doc.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.app-doc.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.app-doc.opentalent.fr.crt
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.frames.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.frames.opentalent.fr.crt
+
+#docker-compose build --no-cache nginx-proxy

docker/nginx/certs/ssl_keys.sh

@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-#a éxécuter dans le dossier certs.
-openssl genrsa -des3 -passout pass:NotSecure -out docker/nginx/certs/default.pass.key 2048
-openssl rsa -passin pass:NotSecure -in docker/nginx/certs/default.pass.key -out docker/nginx/certs/default.key
-rm docker/nginx/certs/default.pass.key
-openssl req -new -passout pass:NotSecure -key docker/nginx/certs/default.key -out docker/nginx/certs/default.csr  -subj '/C=SS/ST=SS/L=Cluses/O=Opentalent Dev/CN=localhost'
-openssl x509 -req -sha256 -days 365 -in docker/nginx/certs/default.csr -signkey docker/nginx/certs/default.key -out docker/nginx/certs/default.crt
-
-#adapter avec le sous domaine souhaité.
-cp docker/nginx/certs/default.key docker/nginx/certs/local.phpmyadmin.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.phpmyadmin.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.api.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.api.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.ap2i.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.ap2i.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.elasticsearch.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.elasticsearch.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.mailcatcher.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.mailcatcher.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.v59.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.v59.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.admin.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.admin.opentalent.fr.crt
-
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.app.opentalent.fr.crt
-cp docker/nginx/certs/default.key docker/nginx/certs/local.app.opentalent.fr.key
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.thumbor.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.thumbor.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.sub.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.sub.opentalent.fr.crt
-cp docker/nginx/certs/default.key docker/nginx/certs/local.sub.customdomain.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.sub.customdomain.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.blackfire.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.blackfire.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.metabase.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.metabase.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.ap2i-doc.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.ap2i-doc.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.app-doc.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.app-doc.opentalent.fr.crt
-
-cp docker/nginx/certs/default.key docker/nginx/certs/local.frames.opentalent.fr.key
-cp docker/nginx/certs/default.crt docker/nginx/certs/local.frames.opentalent.fr.crt
-
-#docker-compose build --no-cache nginx-proxy