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.

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 DNS instructions for solr, activemq, and blazegraph #61

Merged
merged 2 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions README.template.md
Original file line number Diff line number Diff line change
Expand Up @@ -443,10 +443,7 @@ This is configured to use a HTTP based challenge and requires that the following
replaced with the production sites domain.

- ${DOMAIN}
- activemq.${DOMAIN}
- blazegraph.${DOMAIN}
- fcrepo.${DOMAIN}
- solr.${DOMAIN}

Each of the above values should be set to the IP address of your production
server.
Expand Down
15 changes: 0 additions & 15 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@ services:
<<: [*prod, *activemq]
labels:
<<: [*traefik-disable, *activemq-labels]
traefik.http.routers.activemq_http.rule: &traefik-host-activemq-prod Host(`activemq.${DOMAIN}`)
traefik.http.routers.activemq_https.rule: *traefik-host-activemq-prod
traefik.http.routers.activemq_https.tls.certresolver: *traefik-certresolver
secrets:
- source: ACTIVEMQ_PASSWORD
- source: ACTIVEMQ_WEB_ADMIN_PASSWORD
Expand All @@ -265,9 +262,6 @@ services:
<<: [*prod, *blazegraph]
labels:
<<: [*traefik-disable, *blazegraph-labels]
traefik.http.routers.blazegraph_http.rule: &traefik-host-blazegraph-prod Host(`blazegraph.${DOMAIN}`)
traefik.http.routers.blazegraph_https.rule: *traefik-host-blazegraph-prod
traefik.http.routers.blazegraph_https.tls.certresolver: *traefik-certresolver
cantaloupe-dev: &cantaloupe
<<: [*dev, *common]
image: ${ISLANDORA_REPOSITORY}/cantaloupe:${ISLANDORA_TAG}
Expand Down Expand Up @@ -556,9 +550,6 @@ services:
<<: [*prod, *solr]
labels:
<<: [*traefik-disable, *solr-labels]
traefik.http.routers.solr_http.rule: &traefik-host-solr-prod Host(`solr.${DOMAIN}`)
traefik.http.routers.solr_https.rule: *traefik-host-solr-prod
traefik.http.routers.solr_https.tls.certresolver: *traefik-certresolver
# Ensure drupal mounts the shared volumes first.
depends_on:
- drupal-prod
Expand Down Expand Up @@ -653,15 +644,9 @@ services:
aliases:
# Allow services to connect on the same name/port as the outside.
- "${DOMAIN}" # Drupal is at the root domain.
- "activemq.${DOMAIN}"
- "blazegraph.${DOMAIN}"
- "fcrepo.${DOMAIN}"
- "solr.${DOMAIN}"
depends_on:
# Sometimes traefik doesn't pick up on new containers so make sure
# they are started before traefik.
- activemq-prod
- blazegraph-prod
- drupal-prod
- fcrepo-prod
- solr-prod