forked from data.coop/ansible
Small fixes. ..
This commit is contained in:
parent
44b5d0830f
commit
03b12aa32e
|
@ -68,6 +68,8 @@
|
||||||
- VAULT_ADDR=http://0.0.0.0:8200
|
- 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}}}
|
- VAULT_LOCAL_CONFIG={"backend":{"consul":{"address":"consul:8500","path":"vault/"}},"listener":{"tcp":{"address":"0.0.0.0:8200","tls_disable":1}}}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
networks:
|
||||||
|
- "gluu"
|
||||||
depends_on:
|
depends_on:
|
||||||
- consul
|
- consul
|
||||||
labels:
|
labels:
|
||||||
|
@ -95,8 +97,8 @@
|
||||||
- LETSENCRYPT_HOST="{{ gluu.domain }}"
|
- LETSENCRYPT_HOST="{{ gluu.domain }}"
|
||||||
- LETSENCRYPT_EMAIL="{{ letsencrypt_email }}"
|
- LETSENCRYPT_EMAIL="{{ letsencrypt_email }}"
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80"
|
||||||
- "443:443"
|
- "443"
|
||||||
networks:
|
networks:
|
||||||
- "external_services"
|
- "external_services"
|
||||||
- "gluu"
|
- "gluu"
|
||||||
|
@ -159,6 +161,7 @@
|
||||||
- "SERVICE_8080_CHECK_TIMEOUT=5s"
|
- "SERVICE_8080_CHECK_TIMEOUT=5s"
|
||||||
|
|
||||||
oxtrust:
|
oxtrust:
|
||||||
|
container_name: oxtrust
|
||||||
image: gluufederation/oxtrust:3.1.5_02
|
image: gluufederation/oxtrust:3.1.5_02
|
||||||
environment:
|
environment:
|
||||||
- GLUU_CONFIG_CONSUL_HOST=consul
|
- GLUU_CONFIG_CONSUL_HOST=consul
|
||||||
|
@ -167,7 +170,6 @@
|
||||||
- GLUU_OXAUTH_BACKEND=oxauth:8080
|
- GLUU_OXAUTH_BACKEND=oxauth:8080
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
- "{{ gluu.domain }}:85.235.225.231"
|
- "{{ gluu.domain }}:85.235.225.231"
|
||||||
container_name: oxtrust
|
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ gluu.volume_folder }}/oxtrust/custom/pages:/opt/gluu/jetty/identity/custom/pages"
|
- "{{ gluu.volume_folder }}/oxtrust/custom/pages:/opt/gluu/jetty/identity/custom/pages"
|
||||||
- "{{ gluu.volume_folder }}/oxtrust/custom/static:/opt/gluu/jetty/identity/custom/static"
|
- "{{ gluu.volume_folder }}/oxtrust/custom/static:/opt/gluu/jetty/identity/custom/static"
|
||||||
|
|
Loading…
Reference in a new issue