From 9ea7156394aef5248c04a1005add6c4ae566dce4 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Tue, 18 Jan 2022 23:43:44 +0100 Subject: [PATCH] workadventure: Config upgrade for latest version --- roles/workadventure/templates/vhost.j2 | 4 ++-- roles/workadventure/templates/workadventure.service.j2 | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/workadventure/templates/vhost.j2 b/roles/workadventure/templates/vhost.j2 index 4837879..64ae8de 100644 --- a/roles/workadventure/templates/vhost.j2 +++ b/roles/workadventure/templates/vhost.j2 @@ -38,7 +38,7 @@ server { ssl_certificate /etc/nginx/ssl/{{ workadventure_domain }}.crt; location / { - root /opt/workadventure/source/front/dist; + root /opt/workadventure/source/src/front/dist; try_files $uri uri/ /index.html?$args; } } @@ -73,4 +73,4 @@ server { location / { proxy_pass http://localhost:8005; } -} +} \ No newline at end of file diff --git a/roles/workadventure/templates/workadventure.service.j2 b/roles/workadventure/templates/workadventure.service.j2 index 79acd43..769c38d 100644 --- a/roles/workadventure/templates/workadventure.service.j2 +++ b/roles/workadventure/templates/workadventure.service.j2 @@ -2,6 +2,7 @@ Description=WorkAdventure service using docker compose Requires=docker.service After=docker.service +Before=nginx.service [Service] Type=simple @@ -15,13 +16,13 @@ TimeoutStartSec=1200 WorkingDirectory=/opt/workadventure/source/ # Make sure no old containers are running -ExecStartPre=/usr/bin/docker-compose -f docker-compose.bk.yaml down -v +ExecStartPre=/usr/bin/docker-compose down -v # Compose up -ExecStart=/usr/bin/docker-compose -f docker-compose.bk.yaml up +ExecStart=/usr/bin/docker-compose up # Compose down, remove containers and volumes -ExecStop=/usr/bin/docker-compose -f docker-compose.bk.yaml down -v +ExecStop=/usr/bin/docker-compose down -v [Install] WantedBy=multi-user.target