Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary reverse proxy. #222

Merged
merged 2 commits into from
Apr 11, 2022
Merged

Remove unnecessary reverse proxy. #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18afcca
Remove unnecessary reverse proxy.
Feb 8, 2022
cefca63
Fix Matomo credential generation.
nigelgbanks Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.blazegraph.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.cantaloupe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.fcrepo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker-compose.fcrepo6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-secrets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down