From 874847f98b23f085429754113f9579af2e6856d6 Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Wed, 5 Jun 2024 13:45:04 -0300 Subject: [PATCH] removed matomo from docker-compose.yml (#44) --- README.md | 1 - README.template.md | 1 - docker-compose.yml | 48 ------------------- .../assets/patches/default_settings.txt | 2 - 4 files changed, 52 deletions(-) diff --git a/README.md b/README.md index 6879bce..b34a4f2 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,6 @@ configurations this template is set up for the following. - `fcrepo` is included by default. - `fits` is included by default. - `mariadb` is used for the backend database (rather than `postgresql`). - - `matomo` is included by default. - `solr` is included by default. - etc. diff --git a/README.template.md b/README.template.md index c0ff921..f6096e9 100644 --- a/README.template.md +++ b/README.template.md @@ -142,7 +142,6 @@ access all the services at the following URLs. | Blazegraph | https://blazegraph.islandora.dev/bigdata/ | | Cantaloupe | https://islandora.dev/cantaloupe | | Fedora | https://fcrepo.islandora.dev/fcrepo/rest/ | -| Matomo | https://islandora.dev/matomo/index.php | | Solr | https://solr.islandora.dev | | Traefik | https://traefik.islandora.dev | diff --git a/docker-compose.yml b/docker-compose.yml index fd2b1f7..2813933 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,7 +65,6 @@ volumes: jetbrains-cache: {} jetbrains-config: {} mariadb-data: {} - matomo-data: {} solr-data: {} secrets: @@ -122,10 +121,6 @@ secrets: # openssl genrsa -out ./secrets/JWT_PRIVATE_KEY 2048 &>/dev/null JWT_PRIVATE_KEY: file: "./secrets/JWT_PRIVATE_KEY" - MATOMO_DB_PASSWORD: - file: "./secrets/MATOMO_DB_PASSWORD" - MATOMO_USER_PASS: - file: "./secrets/MATOMO_USER_PASS" services: alpaca-dev: &alpaca @@ -316,7 +311,6 @@ services: DRUPAL_DEFAULT_FCREPO_PORT: 8080 DRUPAL_DEFAULT_FCREPO_URL: "https://fcrepo.islandora.dev/fcrepo/rest/" DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG: "true" - DRUPAL_DEFAULT_MATOMO_URL: "https://islandora.dev/matomo/" DRUPAL_DEFAULT_NAME: "Islandora Digital Collections" DRUPAL_DEFAULT_PROFILE: "minimal" DRUPAL_DEFAULT_SITE_URL: "islandora.dev" @@ -357,7 +351,6 @@ services: DEVELOPMENT_ENVIRONMENT: false DRUPAL_DEFAULT_CANTALOUPE_URL: "https://${DOMAIN}/cantaloupe/iiif/2" DRUPAL_DEFAULT_FCREPO_URL: "https://fcrepo.${DOMAIN}/fcrepo/rest/" - DRUPAL_DEFAULT_MATOMO_URL: "https://${DOMAIN}/matomo/" DRUPAL_DEFAULT_SITE_URL: "${DOMAIN}" DRUPAL_DRUSH_URI: "https://${DOMAIN}" labels: @@ -516,47 +509,6 @@ services: depends_on: activemq-prod: condition: service_started - matomo-dev: &matomo - <<: [*dev, *common] - image: ${ISLANDORA_REPOSITORY}/matomo:${ISLANDORA_TAG} - labels: &matomo-labels - <<: [*traefik-enable, *traefik-https-redirect-middleware] - traefik.http.middlewares.matomo-custom-request-headers.headers.customrequestheaders.X-Forwarded-Uri: /matomo - traefik.http.middlewares.matomo-append-slash.redirectregex.regex: ^(https?://[^/]+/matomo)$$ - traefik.http.middlewares.matomo-append-slash.redirectregex.replacement: $${1}/ - traefik.http.middlewares.matomo-strip-prefix.stripprefix.prefixes: /matomo - traefik.http.middlewares.matomo.chain.middlewares: matomo-append-slash,matomo-strip-prefix,matomo-custom-request-headers - traefik.http.routers.matomo_http.entrypoints: http - traefik.http.routers.matomo_http.middlewares: *traefik-https-redirect - traefik.http.routers.matomo_http.rule: &traefik-host-matomo-dev Host(`islandora.dev`) && PathPrefix(`/matomo`) - traefik.http.routers.matomo_http.service: matomo - traefik.http.routers.matomo_https.entrypoints: https - traefik.http.routers.matomo_https.middlewares: matomo - traefik.http.routers.matomo_https.rule: *traefik-host-matomo-dev - traefik.http.routers.matomo_https.tls: true - traefik.http.services.matomo.loadbalancer.server.port: 80 - environment: &matomo-environment - MATOMO_DEFAULT_HOST: "https://islandora.dev" - volumes: - - matomo-data:/var/www/matomo:Z,rw - networks: - default: - aliases: # Allow access without using the `-dev` or `-prod` suffix. - - matomo - matomo-prod: - <<: [*prod, *matomo] - labels: - <<: [*matomo-labels] - traefik.http.routers.matomo_http.rule: &traefik-host-matomo-prod Host(`${DOMAIN}`) && PathPrefix(`/matomo`) - traefik.http.routers.matomo_https.rule: *traefik-host-matomo-prod - traefik.http.routers.matomo_https.tls.certresolver: *traefik-certresolver - environment: - <<: *matomo-environment - MATOMO_DEFAULT_HOST: "https://${DOMAIN}" - secrets: - - source: DB_ROOT_PASSWORD - - source: MATOMO_DB_PASSWORD - - source: MATOMO_USER_PASS solr-dev: &solr <<: [*dev, *common] image: ${ISLANDORA_REPOSITORY}/solr:${ISLANDORA_TAG} diff --git a/drupal/rootfs/var/www/drupal/assets/patches/default_settings.txt b/drupal/rootfs/var/www/drupal/assets/patches/default_settings.txt index a6670e0..02aa1c3 100644 --- a/drupal/rootfs/var/www/drupal/assets/patches/default_settings.txt +++ b/drupal/rootfs/var/www/drupal/assets/patches/default_settings.txt @@ -43,8 +43,6 @@ $config['islandora.settings']['broker_url'] = file_get_contents($path . 'DRUPAL_ $config['islandora.settings']['broker_user'] = file_exists($path . 'DRUPAL_DEFAULT_BROKER_USER') ? file_get_contents($path . 'DRUPAL_DEFAULT_BROKER_USER') : NULL; $config['islandora.settings']['broker_password'] = file_exists($path . 'DRUPAL_DEFAULT_BROKER_PASSWORD') ? file_get_contents($path . 'DRUPAL_DEFAULT_BROKER_PASSWORD') : NULL; $config['islandora_iiif.settings']['iiif_server'] = file_get_contents($path . 'DRUPAL_DEFAULT_CANTALOUPE_URL'); -$config['matomo.settings']['url_http'] = file_get_contents($path . 'DRUPAL_DEFAULT_MATOMO_URL'); -$config['matomo.settings']['url_https'] = file_get_contents($path . 'DRUPAL_DEFAULT_MATOMO_URL'); $config['openseadragon.settings']['iiif_server'] = file_get_contents($path . 'DRUPAL_DEFAULT_CANTALOUPE_URL'); $config['search_api.server.default_solr_server']['backend_config']['connector_config']['host'] = file_get_contents($path . 'DRUPAL_DEFAULT_SOLR_HOST'); $config['search_api.server.default_solr_server']['backend_config']['connector_config']['port'] = file_get_contents($path . 'DRUPAL_DEFAULT_SOLR_PORT');