From cfceb6d435aeb793dcd4f850888dea5ec491bf2b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 4 May 2022 13:50:33 +0200 Subject: [PATCH] Cleanup of earlier merge --- README.md | 4 ++ ccp/docker-compose.yml | 2 +- landing/index.html | 84 ------------------------- lib/add_bc_user.sh | 1 - lib/generate.sh | 85 ++++++++++++++++---------- lib/prerequisites.sh | 16 ++--- lib/remove-bridgehead-units.sh | 18 +++++- lib/setup-bridgehead-units.sh | 17 ++++-- lib/systemd/bridgehead-update@.service | 6 +- lib/systemd/bridgehead@.service | 9 +-- start-bridgehead.sh | 2 +- stop-bridgehead.sh | 2 +- 12 files changed, 108 insertions(+), 138 deletions(-) delete mode 100644 landing/index.html 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 - - - - - - - - - - @@ -68,19 +98,12 @@ cat > ./landing/index.html < - - Bridgehead - Reverse Proxy Traefik - - - DKTK - Blaze - + ${LOCAL_SERVICES} -