From bd587ae115649d05f6319eade9c21fd834ee2b4e Mon Sep 17 00:00:00 2001 From: Joe Corall Date: Mon, 3 Jun 2024 15:40:11 -0400 Subject: [PATCH] rm matomo --- build/docker-compose/docker-compose.acme.yml | 3 --- build/docker-compose/docker-compose.drupal.yml | 1 - build/docker-compose/docker-compose.secrets.yml | 9 --------- build/docker-compose/docker-compose.traefik.yml | 2 +- build/scripts/generate-secrets.sh | 11 ----------- sample.env | 6 +----- 6 files changed, 2 insertions(+), 30 deletions(-) diff --git a/build/docker-compose/docker-compose.acme.yml b/build/docker-compose/docker-compose.acme.yml index 8fb4c5196..229be0e1d 100644 --- a/build/docker-compose/docker-compose.acme.yml +++ b/build/docker-compose/docker-compose.acme.yml @@ -40,6 +40,3 @@ services: drupal: labels: - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-drupal_https.tls.certresolver=myresolver - matomo: - labels: - - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-matomo_https.tls.certresolver=myresolver diff --git a/build/docker-compose/docker-compose.drupal.yml b/build/docker-compose/docker-compose.drupal.yml index 3e8d670de..9de21bfa3 100644 --- a/build/docker-compose/docker-compose.drupal.yml +++ b/build/docker-compose/docker-compose.drupal.yml @@ -12,7 +12,6 @@ services: DRUPAL_DEFAULT_CANTALOUPE_URL: https://${DOMAIN}/cantaloupe/iiif/2 DRUPAL_DEFAULT_FCREPO_HOST: ${DOMAIN} DRUPAL_DEFAULT_FCREPO_PORT: 8081 - DRUPAL_DEFAULT_MATOMO_URL: https://${DOMAIN}/matomo/ DRUPAL_DEFAULT_SITE_URL: http://${DOMAIN} # Make sure this is just http and not https! DRUPAL_DEFAULT_PROFILE: ${DRUPAL_INSTALL_PROFILE} PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT} diff --git a/build/docker-compose/docker-compose.secrets.yml b/build/docker-compose/docker-compose.secrets.yml index 80c69e99b..dfb9e91e9 100644 --- a/build/docker-compose/docker-compose.secrets.yml +++ b/build/docker-compose/docker-compose.secrets.yml @@ -26,10 +26,6 @@ secrets: file: "../../secrets/live/JWT_PUBLIC_KEY" JWT_PRIVATE_KEY: file: "../../secrets/live/JWT_PRIVATE_KEY" - MATOMO_DB_PASSWORD: - file: "../../secrets/live/MATOMO_DB_PASSWORD" - MATOMO_USER_PASS: - file: "../../secrets/live/MATOMO_USER_PASS" TOMCAT_ADMIN_PASSWORD: file: "../../secrets/live/TOMCAT_ADMIN_PASSWORD" services: @@ -74,11 +70,6 @@ services: mariadb: secrets: - DB_ROOT_PASSWORD - matomo: - secrets: - - DB_ROOT_PASSWORD - - MATOMO_DB_PASSWORD - - MATOMO_USER_PASS milliner: secrets: - JWT_ADMIN_TOKEN diff --git a/build/docker-compose/docker-compose.traefik.yml b/build/docker-compose/docker-compose.traefik.yml index 0b88c0380..cb9c65d8e 100644 --- a/build/docker-compose/docker-compose.traefik.yml +++ b/build/docker-compose/docker-compose.traefik.yml @@ -40,7 +40,7 @@ services: - --providers.file.filename=/etc/traefik/tls.yml - '--providers.docker.defaultRule=Host(`${DOMAIN}`)' ports: - - 80:80 # drupal, cantaloupe, matomo + - 80:80 # drupal, cantaloupe - 443:443 # https for ^^^ - ${FEDORA_PORT:-8081}:8081 # fedora, needs to be exposed for cantaloupe # Don't do any of these in production diff --git a/build/scripts/generate-secrets.sh b/build/scripts/generate-secrets.sh index 56aa48026..80290e71d 100755 --- a/build/scripts/generate-secrets.sh +++ b/build/scripts/generate-secrets.sh @@ -8,14 +8,6 @@ function generate_jwt_keys() { openssl rsa -pubout -in /tmp/private.key -out /tmp/public.key &>/dev/null } -function generate_matomo_password() { - # Password is in two parts, the part that is human readable and entered into - # 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);" >/secrets/live/MATOMO_USER_PASS -} - function random_secret() { local characters=${1} local size=${2} @@ -44,9 +36,6 @@ function main() { JWT_PUBLIC_KEY) cp /tmp/public.key /secrets/live/JWT_PUBLIC_KEY ;; - MATOMO_USER_PASS) - generate_matomo_password - ;; *) random_secret 'A-Za-z0-9' 48 "${secret}" ;; diff --git a/sample.env b/sample.env index 3ed7d7afb..c974539b1 100644 --- a/sample.env +++ b/sample.env @@ -80,7 +80,7 @@ INCLUDE_ETCD_SERVICE=false INCLUDE_CODE_SERVER_SERVICE=false # Choose which database backend to use: mariadb/postgresql -# Services that only support MySQL (Matomo) do not have the option to change. +# Services that only support MySQL do not have the option to change. # Also at this time not all Drupal modules work with PostgresSQL, it is provided # as option here so it can be tested and fixed at some later date. DRUPAL_DATABASE_SERVICE=mariadb @@ -103,9 +103,6 @@ TAG=3.2.2 # Expose Cantaloupe at ${DOMAIN}/cantaloupe EXPOSE_CANTALOUPE=true -# Expose Matomo at ${DOMAIN}/matomo -EXPOSE_MATOMO=true - # Expose Drupal at ${DOMAIN} EXPOSE_DRUPAL=true @@ -186,7 +183,6 @@ HOUDINI_MEMORY_LIMIT=1G HYPERCUBE_MEMORY_LIMIT=512M IDE_MEMORY_LIMIT=5G MARIADB_MEMORY_LIMIT=1G -MATOMO_MEMORY_LIMIT=1G MILLINER_MEMORY_LIMIT=1G RECAST_MEMORY_LIMIT=1G SOLR_MEMORY_LIMIT=8G