fix vm vagrant

bin/.commonFunctions.sh

@@ -224,10 +224,10 @@ waitUrl () {
     # $1 URL to waitfor
     # $2 timeout en secondes (optional)
     starttime=$(date +%s)
-    if [[ $(curl --connect-timeout 2 -s -D - "$1" -o /dev/null 2>/dev/null | head -n1) != *[23]0[0-9]* ]]; then
+    if [[ $(curl -k --connect-timeout 2 -s -D - "$1" -o /dev/null 2>/dev/null | head -n1) != *[23]0[0-9]* ]]; then
 	printKazMsg "service not available ($1). Please wait..."
-	echo curl --connect-timeout 2 -s -D - "$1" -o /dev/null \|  head -n1
+  echo curl -k --connect-timeout 2 -s -D - "$1" -o /dev/null \|  head -n1
-	while [[ $(curl --connect-timeout 2 -s -D - "$1" -o /dev/null 2>/dev/null | head -n1) != *[23]0[0-9]* ]]
+  while [[ $(curl -k --connect-timeout 2 -s -D - "$1" -o /dev/null 2>/dev/null | head -n1) != *[23]0[0-9]* ]]
 	do
 	    sleep 5
         if [ $# -gt 1 ]; then

dockers/traefik/conf/allow_ip.yml.dist

@@ -0,0 +1,11 @@
+http:
+  middlewares:
+    test-ipallowlist:
+      ipallowlist:
+        sourceRange:
+          # tlm est autorisé
+          - "0.0.0.0/0"
+    test-adminipallowlist:
+      ipallowlist:
+        sourceRange:
+          - "127.0.0.1"

dockers/traefik/conf/allow_ip.yml.sample

@@ -1,18 +0,0 @@
-http:
-  middlewares:
-    ipwhitelist:
-      ipWhiteList:
-        sourceRange:
-          - "192.168.0.0/16"
-          - "172.16.0.0/12"
-          - "127.0.0.0/8"
-          - "10.0.0.0/8"
-          - "0.0.0.0/0"	
-    adminipwhitelist:
-      ipWhiteList:
-        sourceRange:
-          - "192.168.0.0/16"
-          - "172.16.0.0/12"
-          - "127.0.0.0/8"
-          - "10.0.0.0/8"
-          - "0.0.0.0/0"	

dockers/traefik/conf/cert.yml.dist

@@ -0,0 +1,6 @@
+tls:
+  stores:
+    default:
+      defaultCertificate:
+        certFile: /etc/traefik/fullchain.pem
+        keyFile: /etc/traefik/privkey.pem

dockers/traefik/first.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+SERV_DIR=$(cd $(dirname $0); pwd)
+KAZ_ROOT=$(cd $(dirname $0)/../..; pwd)
+. "${KAZ_ROOT}/bin/.commonFunctions.sh"
+setKazVars
+
+cd $(dirname $0)
+. "${DOCKERS_ENV}"
+
+
+printKazMsg "\n  *** Premier lancement de Traefik : Mise en place"
+
+[[ -f "conf/allow_ip.yml" ]] || cp "conf/allow_ip.yml.dist" "conf/allow_ip.yml"
+cp /etc/letsencrypt/live/${domain}/{fullchain.pem,privkey.pem} conf/
+[[ -f "conf/cert.yml" ]] || cp "conf/cert.yml.dist" "conf/cert.yml"