From 18afcca57a8ca68a1cb1a4239b0fce7c449d6c80 Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Tue, 8 Feb 2022 22:24:00 +0000 Subject: [PATCH 1/2] Remove unnecessary reverse proxy. --- docker-compose.blazegraph.yml | 2 +- docker-compose.cantaloupe.yml | 2 +- docker-compose.fcrepo.yml | 2 +- docker-compose.fcrepo6.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.blazegraph.yml b/docker-compose.blazegraph.yml index aa547ce0d..05f733376 100644 --- a/docker-compose.blazegraph.yml +++ b/docker-compose.blazegraph.yml @@ -16,7 +16,7 @@ services: default: labels: - traefik.enable=${EXPOSE_BLAZEGRAPH:-false} - - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-blazegraph.loadbalancer.server.port=80 + - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-blazegraph.loadbalancer.server.port=8080 - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-blazegraph_http.service=${COMPOSE_PROJECT_NAME-isle-dc}-blazegraph - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-blazegraph_http.entrypoints=blazegraph deploy: diff --git a/docker-compose.cantaloupe.yml b/docker-compose.cantaloupe.yml index c9dfc5c1c..6c09304fd 100644 --- a/docker-compose.cantaloupe.yml +++ b/docker-compose.cantaloupe.yml @@ -18,7 +18,7 @@ services: - cantaloupe-data:/data labels: - traefik.enable=${EXPOSE_CANTALOUPE:-true} - - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-cantaloupe.loadbalancer.server.port=80 + - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-cantaloupe.loadbalancer.server.port=8080 - traefik.http.middlewares.cantaloupe-redirectscheme.redirectscheme.scheme=https - traefik.http.middlewares.cantaloupe-redirectscheme.redirectscheme.permanent=true - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-cantaloupe_http.service=${COMPOSE_PROJECT_NAME-isle-dc}-cantaloupe diff --git a/docker-compose.fcrepo.yml b/docker-compose.fcrepo.yml index d89bc36f1..74a2ab407 100644 --- a/docker-compose.fcrepo.yml +++ b/docker-compose.fcrepo.yml @@ -25,6 +25,6 @@ services: labels: # Do not expose in production. - traefik.enable=${EXPOSE_FEDORA:-false} - - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo.loadbalancer.server.port=80 + - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo.loadbalancer.server.port=8080 - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo_http.service=${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo_http.entrypoints=fcrepo diff --git a/docker-compose.fcrepo6.yml b/docker-compose.fcrepo6.yml index 0346ffdb5..13d5c820c 100644 --- a/docker-compose.fcrepo6.yml +++ b/docker-compose.fcrepo6.yml @@ -25,7 +25,7 @@ services: labels: # Do not expose in production. - traefik.enable=${EXPOSE_FEDORA:-false} - - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo.loadbalancer.server.port=80 + - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo.loadbalancer.server.port=8080 - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo_http.service=${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo_http.entrypoints=fcrepo deploy: From cefca63956e9f6d1fc6618596473f6b3752bb2b8 Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Sun, 10 Apr 2022 14:50:20 +0100 Subject: [PATCH 2/2] Fix Matomo credential generation. --- scripts/generate-secrets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-secrets.sh b/scripts/generate-secrets.sh index 82e106854..a7ed40abc 100755 --- a/scripts/generate-secrets.sh +++ b/scripts/generate-secrets.sh @@ -13,7 +13,7 @@ function generate_matomo_password() { # the form, and the hashed version which is written into the database. random_secret 'A-Za-z0-9' 48 MATOMO_USER_PASS_NON_HASHED MATOMO_USER_PASS=$(cat /secrets/live/MATOMO_USER_PASS_NON_HASHED) - php -r "echo password_hash(md5('${MATOMO_USER_PASS}'), PASSWORD_DEFAULT) . '\n';" >/secrets/live/MATOMO_USER_PASS + php -r "echo password_hash(md5('${MATOMO_USER_PASS}'), PASSWORD_DEFAULT);" >/secrets/live/MATOMO_USER_PASS } function random_secret() {