From f8b9aed7f52b1c0774b94afbbac20d23aad612eb Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Mon, 17 Oct 2022 15:09:18 +0200 Subject: [PATCH] Cleaning --- .gitignore | 8 +-- ccp/docker-compose.yml | 4 +- lib/generate.sh | 116 ----------------------------------------- lib/log.sh | 0 lib/prerequisites.sh | 20 +++---- site.dev.conf | 11 ---- 6 files changed, 13 insertions(+), 146 deletions(-) delete mode 100755 lib/generate.sh mode change 100644 => 100755 lib/log.sh delete mode 100644 site.dev.conf diff --git a/.gitignore b/.gitignore index d6c86b5..2c4c7ec 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,4 @@ site-config/* ## Ignore site configuration -config/**/* -!config/**/*.default -landing/* -docker-compose.override.yml -site.conf -auth/* -certs/* +*/docker-compose.override.yml diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 65343d6..2539d8e 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -25,8 +25,8 @@ services: - 80:80 - 443:443 volumes: - - ../certs:/tools/certs - - ../lib/traefik-configuration/:/configuration + - /etc/bridgehead/traefik-tls:/tools/certs:ro + - ../lib/traefik-configuration/:/configuration:ro - /var/run/docker.sock:/var/run/docker.sock:ro forward_proxy: diff --git a/lib/generate.sh b/lib/generate.sh deleted file mode 100755 index 9673055..0000000 --- a/lib/generate.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash - -if [ ! -d ./landing ] -then - mkdir landing -fi - -if [ ! -f ./landing/index.html ] -then - touch index.html -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 < - - - - - - Bridgehead Overview - - - - - - - - - -