From 1e0132c29e34e1043cf140528c6aa3d0fa138a73 Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Thu, 12 Sep 2024 10:38:30 -0300 Subject: [PATCH 1/7] added instructions to disable fedora --- .../site-template/docker-modifications.md | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/installation/docker/site-template/docker-modifications.md b/docs/installation/docker/site-template/docker-modifications.md index 6caa0609f..e962d945b 100644 --- a/docs/installation/docker/site-template/docker-modifications.md +++ b/docs/installation/docker/site-template/docker-modifications.md @@ -46,3 +46,24 @@ If you are removing a container which is referenced by Drupal, ensure that you u After doing `docker compose down`, run `docker compose up -d --remove-orphans` to remove the containers you removed from the docker-compose.yml file. +## Hiding Fedora From the Public + +By default, your Fedora repo will be available to the public at `fcrepo.${DOMAIN}`. If you do not want to expose your Fedora, you can stop this URL from working by disabling it via Traefik in your `docker-compose.yml`. To do this, you need to add the `traefik-disable` label to fcrepo-prod like this, + +``` + fcrepo-prod: + <<: [*prod, *fcrepo] + environment: + <<: [*fcrepo-environment] + FCREPO_ALLOW_EXTERNAL_DRUPAL: "https://${DOMAIN}/" + labels: + <<: [*traefik-disable, *fcrepo-labels] +``` + +If you have done this, you can also remove the DNS records that point this URL to your prodcution server. + +Finally, you will have to change the URL that Drupal uses to access the Fedora repo. This can be found in your `docker-compose.ym'` in the `environment` section for `drupal-prod`, and should be changed to: + +``` +DRUPAL_DEFAULT_FCREPO_URL: "http://fcrepo:8080/fcrepo/rest/" +``` From 425988c3fb7e9eb72bba39d09b85ffefc15aac43 Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Wed, 18 Sep 2024 15:02:52 -0300 Subject: [PATCH 2/7] Update docs/installation/docker/site-template/docker-modifications.md Co-authored-by: Adam <607975+adam-vessey@users.noreply.github.com> --- docs/installation/docker/site-template/docker-modifications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/docker/site-template/docker-modifications.md b/docs/installation/docker/site-template/docker-modifications.md index e962d945b..8ddff3cc6 100644 --- a/docs/installation/docker/site-template/docker-modifications.md +++ b/docs/installation/docker/site-template/docker-modifications.md @@ -62,7 +62,7 @@ By default, your Fedora repo will be available to the public at `fcrepo.${DOMAIN If you have done this, you can also remove the DNS records that point this URL to your prodcution server. -Finally, you will have to change the URL that Drupal uses to access the Fedora repo. This can be found in your `docker-compose.ym'` in the `environment` section for `drupal-prod`, and should be changed to: +Finally, you will have to change the URL that Drupal uses to access the Fedora repo. This can be found in your `docker-compose.yml'` in the `environment` section for `drupal-prod`, and should be changed to: ``` DRUPAL_DEFAULT_FCREPO_URL: "http://fcrepo:8080/fcrepo/rest/" From 8ed87dc433363a6103a0c8f08575a038e78cfa25 Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Wed, 18 Sep 2024 15:03:00 -0300 Subject: [PATCH 3/7] Update docs/installation/docker/site-template/docker-modifications.md Co-authored-by: Adam <607975+adam-vessey@users.noreply.github.com> --- docs/installation/docker/site-template/docker-modifications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/docker/site-template/docker-modifications.md b/docs/installation/docker/site-template/docker-modifications.md index 8ddff3cc6..3fdac8c53 100644 --- a/docs/installation/docker/site-template/docker-modifications.md +++ b/docs/installation/docker/site-template/docker-modifications.md @@ -60,7 +60,7 @@ By default, your Fedora repo will be available to the public at `fcrepo.${DOMAIN <<: [*traefik-disable, *fcrepo-labels] ``` -If you have done this, you can also remove the DNS records that point this URL to your prodcution server. +If you have done this, you can also remove the DNS records that point this URL to your production server. Finally, you will have to change the URL that Drupal uses to access the Fedora repo. This can be found in your `docker-compose.yml'` in the `environment` section for `drupal-prod`, and should be changed to: From d39da849ca7c2a5ceea6106cfdb5f1b84beeb813 Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Wed, 18 Sep 2024 15:03:17 -0300 Subject: [PATCH 4/7] Update docs/installation/docker/site-template/docker-modifications.md Co-authored-by: Adam <607975+adam-vessey@users.noreply.github.com> --- docs/installation/docker/site-template/docker-modifications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/docker/site-template/docker-modifications.md b/docs/installation/docker/site-template/docker-modifications.md index 3fdac8c53..a3dcf0cd0 100644 --- a/docs/installation/docker/site-template/docker-modifications.md +++ b/docs/installation/docker/site-template/docker-modifications.md @@ -48,7 +48,7 @@ After doing `docker compose down`, run `docker compose up -d --remove-orphans` t ## Hiding Fedora From the Public -By default, your Fedora repo will be available to the public at `fcrepo.${DOMAIN}`. If you do not want to expose your Fedora, you can stop this URL from working by disabling it via Traefik in your `docker-compose.yml`. To do this, you need to add the `traefik-disable` label to fcrepo-prod like this, +By default, your Fedora repo will be available to the public at `fcrepo.${DOMAIN}`. If you do not want to expose your Fedora, you can stop this URL from working by disabling it via Traefik in your `docker-compose.yml`. To do this, you need to add the `traefik-disable` label to `fcrepo-prod` like this, ``` fcrepo-prod: From 3e7640ce142863d36221b5697b3661c2d58c7428 Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Wed, 18 Sep 2024 15:03:32 -0300 Subject: [PATCH 5/7] Update docs/installation/docker/site-template/docker-modifications.md Co-authored-by: Adam <607975+adam-vessey@users.noreply.github.com> --- docs/installation/docker/site-template/docker-modifications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/docker/site-template/docker-modifications.md b/docs/installation/docker/site-template/docker-modifications.md index a3dcf0cd0..c5b9d0799 100644 --- a/docs/installation/docker/site-template/docker-modifications.md +++ b/docs/installation/docker/site-template/docker-modifications.md @@ -50,7 +50,7 @@ After doing `docker compose down`, run `docker compose up -d --remove-orphans` t By default, your Fedora repo will be available to the public at `fcrepo.${DOMAIN}`. If you do not want to expose your Fedora, you can stop this URL from working by disabling it via Traefik in your `docker-compose.yml`. To do this, you need to add the `traefik-disable` label to `fcrepo-prod` like this, -``` +```yaml fcrepo-prod: <<: [*prod, *fcrepo] environment: From 396c103eb4e77b29ddd2ae16ce8055cec8386af0 Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Wed, 18 Sep 2024 15:03:51 -0300 Subject: [PATCH 6/7] Update docs/installation/docker/site-template/docker-modifications.md Co-authored-by: Adam <607975+adam-vessey@users.noreply.github.com> --- docs/installation/docker/site-template/docker-modifications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/docker/site-template/docker-modifications.md b/docs/installation/docker/site-template/docker-modifications.md index c5b9d0799..fd9d8ef91 100644 --- a/docs/installation/docker/site-template/docker-modifications.md +++ b/docs/installation/docker/site-template/docker-modifications.md @@ -64,6 +64,6 @@ If you have done this, you can also remove the DNS records that point this URL t Finally, you will have to change the URL that Drupal uses to access the Fedora repo. This can be found in your `docker-compose.yml'` in the `environment` section for `drupal-prod`, and should be changed to: -``` +```yaml DRUPAL_DEFAULT_FCREPO_URL: "http://fcrepo:8080/fcrepo/rest/" ``` From 40e2aa529e20b3ae264cf7ab8a914fa32b544aee Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Wed, 18 Sep 2024 15:07:35 -0300 Subject: [PATCH 7/7] Update docs/installation/docker/site-template/docker-modifications.md Co-authored-by: Adam <607975+adam-vessey@users.noreply.github.com> --- docs/installation/docker/site-template/docker-modifications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/docker/site-template/docker-modifications.md b/docs/installation/docker/site-template/docker-modifications.md index fd9d8ef91..d9dcd8ef9 100644 --- a/docs/installation/docker/site-template/docker-modifications.md +++ b/docs/installation/docker/site-template/docker-modifications.md @@ -62,7 +62,7 @@ By default, your Fedora repo will be available to the public at `fcrepo.${DOMAIN If you have done this, you can also remove the DNS records that point this URL to your production server. -Finally, you will have to change the URL that Drupal uses to access the Fedora repo. This can be found in your `docker-compose.yml'` in the `environment` section for `drupal-prod`, and should be changed to: +Finally, you will have to change the URL that Drupal uses to access the Fedora repo. This can be found in your `docker-compose.yml` in the `environment` section for `drupal-prod`, and should be changed to: ```yaml DRUPAL_DEFAULT_FCREPO_URL: "http://fcrepo:8080/fcrepo/rest/"