From 03b12aa32e8e30d19d5a8562dab57e3eb61e3a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Sat, 31 Aug 2019 19:58:04 +0200
Subject: [PATCH] Small fixes. ..

---
 roles/docker/tasks/services/gluu.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/roles/docker/tasks/services/gluu.yml b/roles/docker/tasks/services/gluu.yml
index f142cf2b..c4545d79 100644
--- a/roles/docker/tasks/services/gluu.yml
+++ b/roles/docker/tasks/services/gluu.yml
@@ -68,6 +68,8 @@
             - VAULT_ADDR=http://0.0.0.0:8200
             - VAULT_LOCAL_CONFIG={"backend":{"consul":{"address":"consul:8500","path":"vault/"}},"listener":{"tcp":{"address":"0.0.0.0:8200","tls_disable":1}}}
           restart: unless-stopped
+          networks:
+            - "gluu"
           depends_on:
             - consul
           labels:
@@ -95,8 +97,8 @@
             - LETSENCRYPT_HOST="{{ gluu.domain }}"
             - LETSENCRYPT_EMAIL="{{ letsencrypt_email }}"
           ports:
-            - "80:80"
-            - "443:443"
+            - "80"
+            - "443"
           networks:
             - "external_services"
             - "gluu"
@@ -159,6 +161,7 @@
             - "SERVICE_8080_CHECK_TIMEOUT=5s"
 
         oxtrust:
+          container_name: oxtrust
           image: gluufederation/oxtrust:3.1.5_02
           environment:
             - GLUU_CONFIG_CONSUL_HOST=consul
@@ -167,7 +170,6 @@
             - GLUU_OXAUTH_BACKEND=oxauth:8080
           extra_hosts:
             - "{{ gluu.domain }}:85.235.225.231"
-          container_name: oxtrust
           volumes:
             - "{{ gluu.volume_folder }}/oxtrust/custom/pages:/opt/gluu/jetty/identity/custom/pages"
             - "{{ gluu.volume_folder }}/oxtrust/custom/static:/opt/gluu/jetty/identity/custom/static"