diff --git a/Makefile b/Makefile index 6affc5c9..be3fbf77 100644 --- a/Makefile +++ b/Makefile @@ -248,7 +248,6 @@ up: bake | docker-compose "ActiveMQ|https://activemq.islandora.dev" \ "Blazegraph|https://blazegraph.islandora.dev/bigdata/" \ "Fedora|https://fcrepo.islandora.dev/fcrepo/rest/" \ - "Matomo|https://islandora.dev/matomo/index.php" \ "Cantaloupe|https://islandora.dev/cantaloupe" \ "Solr|https://solr.islandora.dev" \ "Traefik|https://traefik.islandora.dev" \ diff --git a/README.md b/README.md index 0d9e0f4d..d2c74274 100644 --- a/README.md +++ b/README.md @@ -361,7 +361,6 @@ Waiting for installation... ActiveMQ https://activemq.islandora.dev Blazegraph https://blazegraph.islandora.dev/bigdata/ 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 f93b4fc6..26a918d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,6 @@ volumes: drupal-solr-config: {} fcrepo-data: {} mariadb-data: {} - matomo-data: {} solr-data: {} secrets: @@ -129,8 +128,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_HTTP: "http://islandora.dev/matomo/" - DRUPAL_DEFAULT_MATOMO_URL_HTTPS: "https://islandora.dev/matomo/" DRUPAL_DEFAULT_NAME: "Islandora Digital Collections" DRUPAL_DEFAULT_PROFILE: "minimal" DRUPAL_DEFAULT_SITE_URL: "islandora.dev" @@ -254,29 +251,6 @@ services: traefik.http.services.fcrepo.loadbalancer.server.port: 8080 volumes: - fcrepo-data:/data:rw - matomo: - <<: *common - image: ${REPOSITORY:-local}/matomo:${TAG:-latest} - labels: - <<: *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 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 - traefik.http.routers.matomo_https.tls: true - traefik.http.services.matomo.loadbalancer.server.port: 80 - environment: - MATOMO_DEFAULT_HOST: "https://islandora.dev" - volumes: - - matomo-data:/var/www/matomo:rw solr: <<: *common image: ${REPOSITORY:-local}/solr:${TAG:-latest} diff --git a/drupal/Dockerfile b/drupal/Dockerfile index 41b97e4e..0abdcac4 100644 --- a/drupal/Dockerfile +++ b/drupal/Dockerfile @@ -48,8 +48,6 @@ ENV \ DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG=false \ DRUPAL_DEFAULT_INSTALL=true \ DRUPAL_DEFAULT_LOCALE=en \ - DRUPAL_DEFAULT_MATOMO_URL_HTTP=http://islandora.traefik.me/matomo/ \ - DRUPAL_DEFAULT_MATOMO_URL_HTTPS=https://islandora.traefik.me/matomo/ \ DRUPAL_DEFAULT_NAME=Default \ DRUPAL_DEFAULT_PROFILE=standard \ DRUPAL_DEFAULT_SALT=9PPaL0CxZAIcq0l9wxgDGlCZrp7JdT_x7v9gVzpdbUjMt1PqDz3uD0Zy-i16DuJ1-Htuq5hqeg \ diff --git a/drupal/rootfs/etc/islandora/utilities.sh b/drupal/rootfs/etc/islandora/utilities.sh index a49b7a57..cf9f566e 100755 --- a/drupal/rootfs/etc/islandora/utilities.sh +++ b/drupal/rootfs/etc/islandora/utilities.sh @@ -580,27 +580,6 @@ function create_solr_core_with_default_config { create_solr_core "${site}" } -# Install matomo and configure. -function configure_matomo_module { - local site site_url site_id matomo_url matomo_http_url - - if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q matomo; then - echo "matomo is not installed. Skipping configuration" - return 0 - fi - - site="${1}" - shift - site_url=$(drupal_site_env "${site}" "SITE_URL") - site_id=$(($(site_index "${site}") + 1)) - matomo_url=$(drupal_site_env "${site}" "MATOMO_URL") - matomo_http_url="http${matomo_url#https}" - - drush -l "${site_url}" -y config-set matomo.settings site_id "${site_id}" - drush -l "${site_url}" -y config-set matomo.settings url_http "${matomo_http_url}" - drush -l "${site_url}" -y config-set matomo.settings url_https "${matomo_url}" -} - # Configure Openseadragon to point use cantaloupe. function configure_openseadragon { local site site_url cantaloupe_url diff --git a/milliner/tests/ServiceStartsWithDefaults/docker-compose.yml b/milliner/tests/ServiceStartsWithDefaults/docker-compose.yml index 8735fc30..c37ba778 100644 --- a/milliner/tests/ServiceStartsWithDefaults/docker-compose.yml +++ b/milliner/tests/ServiceStartsWithDefaults/docker-compose.yml @@ -5,7 +5,7 @@ version: "3.8" x-common: &common restart: "no" -name: matomo-servicestartswithdefaults +name: milliner-servicestartswithdefaults services: milliner: <<: *common diff --git a/test/rootfs/var/www/drupal/assets/patches/default_settings.txt b/test/rootfs/var/www/drupal/assets/patches/default_settings.txt index a6670e04..02aa1c32 100644 --- a/test/rootfs/var/www/drupal/assets/patches/default_settings.txt +++ b/test/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');