From 6d94ebd4eb671c5ce8d04663dbcd1237b59150f3 Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Fri, 30 Jun 2023 06:02:32 +0000 Subject: [PATCH 1/2] Add path stripper --- bbmri/modules/dnpm-compose.yml | 2 ++ ccp/modules/dnpm-compose.yml | 2 ++ minimal/modules/dnpm-compose.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/bbmri/modules/dnpm-compose.yml b/bbmri/modules/dnpm-compose.yml index 0cbc45f..9201fe4 100644 --- a/bbmri/modules/dnpm-compose.yml +++ b/bbmri/modules/dnpm-compose.yml @@ -40,6 +40,8 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.dnpm-connect.rule=PathPrefix(`/dnpm-connect`)" + - "traefik.http.middlewares.dnpm-connect-strip.stripprefix.prefixes=/dnpm-connect" + - "traefik.http.routers.dnpm-connect.middlewares=dnpm-connect-strip" - "traefik.http.services.dnpm-connect.loadbalancer.server.port=8062" - "traefik.http.routers.dnpm-connect.tls=true" diff --git a/ccp/modules/dnpm-compose.yml b/ccp/modules/dnpm-compose.yml index 9286d32..336ae1c 100644 --- a/ccp/modules/dnpm-compose.yml +++ b/ccp/modules/dnpm-compose.yml @@ -24,5 +24,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.dnpm-connect.rule=PathPrefix(`/dnpm-connect`)" + - "traefik.http.middlewares.dnpm-connect-strip.stripprefix.prefixes=/dnpm-connect" + - "traefik.http.routers.dnpm-connect.middlewares=dnpm-connect-strip" - "traefik.http.services.dnpm-connect.loadbalancer.server.port=8062" - "traefik.http.routers.dnpm-connect.tls=true" diff --git a/minimal/modules/dnpm-compose.yml b/minimal/modules/dnpm-compose.yml index 276f5ff..155ee9c 100644 --- a/minimal/modules/dnpm-compose.yml +++ b/minimal/modules/dnpm-compose.yml @@ -40,6 +40,8 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.dnpm-connect.rule=PathPrefix(`/dnpm-connect`)" + - "traefik.http.middlewares.dnpm-connect-strip.stripprefix.prefixes=/dnpm-connect" + - "traefik.http.routers.dnpm-connect.middlewares=dnpm-connect-strip" - "traefik.http.services.dnpm-connect.loadbalancer.server.port=8062" - "traefik.http.routers.dnpm-connect.tls=true" From dd0c28daf32dd021df2f9695696366e83fde2ea0 Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Fri, 30 Jun 2023 07:50:18 +0000 Subject: [PATCH 2/2] Add new dktk root cert --- bbmri/modules/dnpm-compose.yml | 2 +- ccp/root-new.crt.pem | 20 ++++++++++++++++++++ minimal/modules/dnpm-compose.yml | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ccp/root-new.crt.pem diff --git a/bbmri/modules/dnpm-compose.yml b/bbmri/modules/dnpm-compose.yml index 9201fe4..d7a253e 100644 --- a/bbmri/modules/dnpm-compose.yml +++ b/bbmri/modules/dnpm-compose.yml @@ -18,7 +18,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/ccp/root-new.crt.pem:/conf/root.crt.pem:ro dnpm-beam-connect: depends_on: [ dnpm-beam-proxy ] diff --git a/ccp/root-new.crt.pem b/ccp/root-new.crt.pem new file mode 100644 index 0000000..100011d --- /dev/null +++ b/ccp/root-new.crt.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDNTCCAh2gAwIBAgIUN7yzueIZzwpe8PaPEIMY8zoH+eMwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjMwNTIzMTAxNzIzWhcNMzMw +NTIwMTAxNzUzWjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAN5JAj+HydSGaxvA0AOcrXVTZ9FfsH0cMVBlQb72 +bGZgrRvkqtB011TNXZfsHl7rPxCY61DcsDJfFq3+8VHT+S9HE0qV1bEwP+oA3xc4 +Opq77av77cNNOqDC7h+jyPhHcUaE33iddmrH9Zn2ofWTSkKHHu3PAe5udCrc2QnD +4PLRF6gqiEY1mcGknJrXj1ff/X0nRY/m6cnHNXz0Cvh8oPOtbdfGgfZjID2/fJNP +fNoNKqN+5oJAZ+ZZ9id9rBvKj1ivW3F2EoGjZF268SgZzc5QrM/D1OpSBQf5SF/V +qUPcQTgt9ry3YR+SZYazLkfKMEOWEa0WsqJVgXdQ6FyergcCAwEAAaN7MHkwDgYD +VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEa70kcseqU5 +bHx2zSt4bG21HokhMB8GA1UdIwQYMBaAFEa70kcseqU5bHx2zSt4bG21HokhMBYG +A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQCGmE7NXW4T +6J4mV3b132cGEMD7grx5JeiXK5EHMlswUS+Odz0NcBNzhUHdG4WVMbrilHbI5Ua+ +6jdKx5WwnqzjQvElP0MCw6sH/35gbokWgk1provOP99WOFRsQs+9Sm8M2XtMf9HZ +m3wABwU/O+dhZZ1OT1PjSZD0OKWKqH/KvlsoF5R6P888KpeYFiIWiUNS5z21Jm8A +ZcllJjiRJ60EmDwSUOQVJJSMOvtr6xTZDZLtAKSN8zN08lsNGzyrFwqjDwU0WTqp +scMXEGBsWQjlvxqDnXyljepR0oqRIjOvgrWaIgbxcnu98tK/OdBGwlAPKNUW7Crr +vO+eHxl9iqd4 +-----END CERTIFICATE----- \ No newline at end of file diff --git a/minimal/modules/dnpm-compose.yml b/minimal/modules/dnpm-compose.yml index 155ee9c..549ed91 100644 --- a/minimal/modules/dnpm-compose.yml +++ b/minimal/modules/dnpm-compose.yml @@ -18,7 +18,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/ccp/root-new.crt.pem:/conf/root.crt.pem:ro dnpm-beam-connect: depends_on: [ dnpm-beam-proxy ]