From b5daf74b1bdb1e5c4d8005cd37ed63ab0477d779 Mon Sep 17 00:00:00 2001
From: Tom Moulard <tom.moulard@traefik.io>
Date: Sun, 27 Feb 2022 11:04:14 +0100
Subject: [PATCH] chore: fixing tests

---
 .env.default               |  2 +-
 test.sh                    |  2 +-
 test_config.yml            |  4 ++++
 vpn/docker-compose.vpn.yml | 10 +++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.env.default b/.env.default
index 7e691e9..5a24fcc 100644
--- a/.env.default
+++ b/.env.default
@@ -22,8 +22,8 @@ TRAEFIK_LOG_LEVEL=
 TRAEFIK_PILOT_TOKEN=
 TRAEFIK_PLUGINS=
 TRAEFIK_SEND_ANONYMOUS_USAGE=
-TRAEFIK_WEB_ENTRYPOINT=
 TRAEFIK_WEBSECURE_ENTRYPOINT=
+TRAEFIK_WEB_ENTRYPOINT=
 TZ=
 USERNAME=
 USERS=
diff --git a/test.sh b/test.sh
index 8ef6ee0..197ee38 100755
--- a/test.sh
+++ b/test.sh
@@ -31,7 +31,7 @@ dc config > $file 2>$log_file
 test diff test_config.yml $file
 mv $file test_config.yml
 
-grep '${' **/docker-compose.*.yml | sed "s/.*\${\(.*\)}.*/\1/g" | cut -d":" -f 1 | sort -u | sort | xargs -I % echo "%=" >> .env.generated
+grep '${' **/docker-compose.*.yml | sed "s/.*\${\(.*\)}.*/\1/g" | cut -d":" -f 1 | sort -u | xargs -I % echo "%=" | sort >> .env.generated
 test diff .env.default .env.generated
 mv .env.generated .env.default
 
diff --git a/test_config.yml b/test_config.yml
index 78f4f5d..3a83f6a 100644
--- a/test_config.yml
+++ b/test_config.yml
@@ -137,6 +137,8 @@ services:
       cluster.name: docker-cluster
       discovery.type: single-node
     image: docker.elastic.co/elasticsearch/elasticsearch:7.1.0
+    labels:
+      traefik.enable: "false"
     restart: always
     ulimits:
       memlock:
@@ -353,6 +355,8 @@ services:
     - /home/runner/work/make-my-server/make-my-server/elk/kibana/kibana.yml:/usr/share/kibana/config/kibana.yml:rw
   logstash:
     image: docker.elastic.co/logstash/logstash:7.1.0
+    labels:
+      traefik.enable: "false"
     links:
     - elasticsearch
     restart: always
diff --git a/vpn/docker-compose.vpn.yml b/vpn/docker-compose.vpn.yml
index b08fce6..4b84937 100644
--- a/vpn/docker-compose.vpn.yml
+++ b/vpn/docker-compose.vpn.yml
@@ -6,11 +6,11 @@ services:
     privileged: true
     restart: always
     environment:
-      VPN_IPSEC_PSK: ${VPN_IPSEC_PSK:-VPN_IPSEC_PSK}
-      VPN_USER: ${VPN_USER:-VPN_USER}
-      VPN_PASSWORD: ${VPN_PASSWORD:-VPN_PASSWORD}
-      VPN_ADDL_USERS: ${VPN_ADDL_USERS:-VPN_ADDL_USERS} # space separated values
-      VPN_ADDL_PASSWORDS: ${VPN_ADDL_PASSWORDS:-VPN_ADDL_PASSWORDS} # space separated values
+      VPN_IPSEC_PSK: ${VPN_IPSEC_PSK}
+      VPN_USER: ${VPN_USER}
+      VPN_PASSWORD: ${VPN_PASSWORD}
+      VPN_ADDL_USERS: ${VPN_ADDL_USERS} # space separated values
+      VPN_ADDL_PASSWORDS: ${VPN_ADDL_PASSWORDS} # space separated values
     ports:
       - '500:500/udp'
       - '4500:4500/udp'