From 3224c53ae5b8c1ef6bed8fc12b92cc55c0c83441 Mon Sep 17 00:00:00 2001
From: "m.lettere" <marco.lettere@nubisware.com>
Date: Tue, 1 Jun 2021 10:15:08 +0200
Subject: [PATCH] corrected local site

---
 local-site/conductor-swarm.yaml         | 7 +++----
 local-site/conductor-workers-swarm.yaml | 3 ++-
 local-site/nginx.default.conf           | 5 +++--
 local-site/pep-swarm.yaml               | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/local-site/conductor-swarm.yaml b/local-site/conductor-swarm.yaml
index abb79b0..5e158d0 100644
--- a/local-site/conductor-swarm.yaml
+++ b/local-site/conductor-swarm.yaml
@@ -2,7 +2,7 @@ version: '3.6'
 
 
 services:
-  conductor-server:
+  conductor-server-local:
     environment:
       - CONFIG_PROP=conductor-swarm-config.properties
     image: "nubisware/conductor-server:3.0.4"
@@ -22,10 +22,9 @@ services:
     logging:
       driver: "journald"
 
-  conductor-ui:
+  conductor-ui-local:
     environment:
-      - WF_SERVER=http://conductor-server:8080/api/
-      - AUTH_CONFIG_PATH=/app/config/auth.config
+      - WF_SERVER=http://conductor-server-local:8080/api/
     image: "nubisware/conductor-ui-oauth2:3.0.4"
     networks:
       - conductor-network
diff --git a/local-site/conductor-workers-swarm.yaml b/local-site/conductor-workers-swarm.yaml
index 681b28d..74a501c 100644
--- a/local-site/conductor-workers-swarm.yaml
+++ b/local-site/conductor-workers-swarm.yaml
@@ -3,7 +3,8 @@ version: '3.6'
 services:
   base:
     environment:
-      CONDUCTOR_SERVER: http://conductor-server:8080/api
+      CONDUCTOR_SERVER: http://conductor-server-local:8080/api/
+      CONDUCTOR_HEALTH: http://conductor-server-local:8080/health
     configs:
       - source: base-config
         target: /app/config.cfg     
diff --git a/local-site/nginx.default.conf b/local-site/nginx.default.conf
index 59396a4..827e6fc 100644
--- a/local-site/nginx.default.conf
+++ b/local-site/nginx.default.conf
@@ -1,11 +1,11 @@
 upstream _conductor-server {
   ip_hash;
-  server conductor-server:8080;
+  server conductor-server-local:8080;
 }
 
 upstream _conductor-ui {
   ip_hash;
-  server conductor-ui:5000;
+  server conductor-ui-local:5000;
 }
 
 server {
@@ -15,6 +15,7 @@ server {
   server_name conductor-server;
 
   location / {
+    proxy_set_header Host $host;
     proxy_pass http://_conductor-server;
   }
 
diff --git a/local-site/pep-swarm.yaml b/local-site/pep-swarm.yaml
index b34297d..bbc320a 100644
--- a/local-site/pep-swarm.yaml
+++ b/local-site/pep-swarm.yaml
@@ -9,7 +9,7 @@ services:
     ports:
       - "80:80"
     deploy:
-      replicas: 1
+      replicas: 1 
       restart_policy:
         condition: on-failure
         delay: 10s