diff --git a/README.md b/README.md
index 96ed3b1..576254f 100644
--- a/README.md
+++ b/README.md
@@ -201,6 +201,10 @@ This will open your default editor allowing you to edit the docker system units
``` conf
[Service]
+
+Environment=http_proxy=
+Environment=https_proxy=
+
Environment=HOSTIP=
Environment=HOST=
Environment=HTTP_PROXY_USER=
diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index 3607efa..99e82eb 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -78,7 +78,7 @@ services:
environment:
APP_BASE_URL: "http://dktk-fed-search-share:8080"
APP_BROKER_BASEURL: "https://dktk-fed-search.verbis.dkfz.de/broker/rest/searchbroker"
- APP_BROKER_MAIL: "foo@bar.de"
+ APP_BROKER_MAIL: ${CCP_MAIL}
APP_STORE_BASEURL: "http://bridgehead-ccp-blaze:8080/fhir"
SPRING_DATASOURCE_URL: "jdbc:postgresql://bridgehead-ccp-share-db:5432/dktk-fed-search-share"
JAVA_TOOL_OPTIONS: "-Xmx1g"
diff --git a/landing/index.html b/landing/index.html
deleted file mode 100644
index 73d2113..0000000
--- a/landing/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
- Bridgehead Overview
-
-
-
-
-
-
-
-
-
-
-
-
Components
-
Central
-
-
-
-
-
Local
-
-
-
- Project |
- Services |
-
-
-
-
- Bridgehead |
- Reverse Proxy Traefik |
-
-
- DKTK |
- Blaze |
-
-
-
-
-
-
-
-
diff --git a/lib/add_bc_user.sh b/lib/add_bc_user.sh
index 924f2e1..1adca14 100755
--- a/lib/add_bc_user.sh
+++ b/lib/add_bc_user.sh
@@ -23,7 +23,6 @@ bc=`docker run --rm -it httpd:latest htpasswd -nb $bc_user $bc_password`
if grep -q -E "Environment=bc_auth_users=" /etc/systemd/system/bridgehead@$1.service.d/override.conf ; then
x=`grep -E "Environment=bc_auth_users=" /etc/systemd/system/bridgehead@$1.service.d/override.conf`
sed -i "/Environment=bc_auth_users=/c\\$x,$bc" /etc/systemd/system/bridgehead@$1.service.d/override.conf
-
else
echo "Environment=bc_auth_users=${bc}" >> /etc/systemd/system/bridgehead@$1.service.d/override.conf
fi
\ No newline at end of file
diff --git a/lib/generate.sh b/lib/generate.sh
index 8d64d14..2d877d3 100755
--- a/lib/generate.sh
+++ b/lib/generate.sh
@@ -1,5 +1,54 @@
#!/bin/bash
+if [ ! -d ./landing ]
+then
+ mkdir landing
+fi
+
+CENTRAL_SERVICES="
+ CCP-IT |
+ Monitoring Service |
+
"
+
+LOCAL_SERVICES="
+ Bridgehead |
+ Reverse Proxy Traefik |
+
"
+
+if [ "$project" = "dktk" ] || [ "$project" = "c4" ] || [ "$project" = "dktk-fed" ]
+then
+ CENTRAL_SERVICES+="
+ CCP-IT |
+ Zentrale Patientenliste |
+
+
+ CCP-IT |
+ Dezentrale Suche |
+
+
+ CCP-IT |
+ Zentrale Suche |
+
+
+ CCP-IT |
+ Deployment-Server |
+
+
+ CCP-IT |
+ Zentraler Kontrollnummernerzeuger |
+
+ "
+fi
+
+if [ "$project" = "dktk-fed" ]
+then
+ LOCAL_SERVICES+="
+ DKTK |
+ Blaze |
+
+ "
+fi
+
cat > ./landing/index.html <
@@ -17,7 +66,7 @@ cat > ./landing/index.html <
-
+
@@ -68,19 +98,12 @@ cat > ./landing/index.html <
-
- Bridgehead |
- Reverse Proxy Traefik |
-
-
- DKTK |
- Blaze |
-
+ ${LOCAL_SERVICES}
-