Unverified Commit b5daf74b authored by Tom Moulard's avatar Tom Moulard
Browse files

chore: fixing tests

parent febe98bd

.env.default

+1 −1
Original line number Diff line number Diff line
@@ -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=

test.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

test_config.yml

+4 −0
Original line number Diff line number Diff line
@@ -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

vpn/docker-compose.vpn.yml

+5 −5
Original line number Diff line number Diff line
@@ -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'