Remove unnecessary reverse proxy. (#222)

* Remove unnecessary reverse proxy. * Fix Matomo credential generation. Co-authored-by: Nigel Banks <[email protected]:w>
Islandora-Devops · Apr 11, 2022 · c7e00e3 · c7e00e3
1 parent 2b23dbe
commit c7e00e3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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:

diff --git 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() {