From 483beee91270f673995848122fa70ed70422988c Mon Sep 17 00:00:00 2001 From: dcore94 Date: Mon, 10 Jan 2022 16:04:38 +0100 Subject: [PATCH] configured dev branch --- conf/service/d4s-cdn.json | 3 ++- site.yaml | 2 +- swarm.yaml | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/conf/service/d4s-cdn.json b/conf/service/d4s-cdn.json index deb862f..65302d3 100644 --- a/conf/service/d4s-cdn.json +++ b/conf/service/d4s-cdn.json @@ -3,6 +3,7 @@ "d4science_iam_base" : "https://accounts.dev.d4science.org/auth", "d4science_cdn_base" : "http://cdn.dev.d4science.org", "gateways" : { - "/gcube/devsec" : ["d4science-example-wp"] + "/gcube/devsec" : ["d4science-example-wp", "dev4.d4science.org", "next.d4science.org"], + "/gcube/devNext" : ["d4science-example-wp", "dev4.d4science.org", "next.d4science.org"] } } diff --git a/site.yaml b/site.yaml index 71a1525..3185d5d 100644 --- a/site.yaml +++ b/site.yaml @@ -3,7 +3,7 @@ vars_files: - conf/secrets.yaml vars: - infrastructure: "local" + infrastructure: "dev" dry: false tasks: - name: Patch PEP config diff --git a/swarm.yaml b/swarm.yaml index 7d29ff9..2ea283a 100644 --- a/swarm.yaml +++ b/swarm.yaml @@ -6,10 +6,10 @@ services: image: nginx:stable-alpine networks: - cdn-network - ports: - - "80:80" + - haproxy-public deploy: mode: replicated + endpoint_mode: dnsrr replicas: 2 restart_policy: condition: on-failure @@ -60,6 +60,8 @@ services: networks: cdn-network: + haproxy-public: + external: true configs: nginx_router_conf: