Skip to content
Permalink
Browse files

Switch from Piwik to Matomo.

  • Loading branch information...
FlorentTorregrosa committed Jun 9, 2018
1 parent 1ee60b1 commit 24395f73f4be4d3f01ffcd0930bebd7d79f511ec
Showing with 36 additions and 33 deletions.
  1. +2 −2 README.md
  2. +1 −1 composer.json
  3. +17 −14 composer.lock
  4. +1 −1 conf/{piwik_nginx → matomo_nginx}/nginx.conf
  5. +2 −2 docker-compose-common.yml
  6. +12 −12 example.docker-compose.yml
  7. +1 −1 example.env
@@ -26,12 +26,12 @@ If using Docker with the default provided configuration, you will have:
* the website accessible through Apache: http://web.ddp8.docker.localhost
* the website accessible through Varnish: http://varnish.ddp8.docker.localhost
* a mail catcher: http://mail.ddp8.docker.localhost
* a Piwik app: http://piwik.ddp8.docker.localhost
* a Matomo app: http://matomo.ddp8.docker.localhost

Note: You have to adapt your DNS configuration to inform your computer to search
for local websites.

For example, you can edit your /etc/hosts file and add an entry like:
```
127.0.0.1 web.ddp8.docker.localhost varnish.ddp8.docker.localhost mail.ddp8.docker.localhost piwik.ddp8.docker.localhost
127.0.0.1 web.ddp8.docker.localhost varnish.ddp8.docker.localhost mail.ddp8.docker.localhost matomo.ddp8.docker.localhost
```
@@ -38,7 +38,7 @@
"drupal/admin_toolbar": "1.24.0",
"drupal/core": "8.5.4",
"drupal/drush_language": "1.0.0-rc2",
"drupal/piwik": "1.2.0",
"drupal/matomo": "1.4.0",
"drupal/purge": "3.0.0-beta8",
"drupal/redis": "1.0.0",
"drupal/search_api": "1.8.0",

Some generated files are not rendered by default. Learn more.

@@ -6,7 +6,7 @@ events {

http {
upstream backend {
server piwik:9000;
server matomo:9000;
}

include /etc/nginx/mime.types;
@@ -70,9 +70,9 @@ services:
mail:
image: djfarrelly/maildev

piwik_nginx:
matomo_nginx:
image: nginx:1.15-alpine
volumes:
- ./conf/piwik_nginx/nginx.conf:/etc/nginx/nginx.conf:ro
- ./conf/matomo_nginx/nginx.conf:/etc/nginx/nginx.conf:ro
environment:
- VIRTUAL_HOST
@@ -59,27 +59,27 @@ services:
- "traefik.frontend.rule=Host:${MAIL_TRAEFIK_FRONTEND_RULE_HOSTNAME:-mail.ddp8.docker.localhost}"
- "traefik.port=80"

# Piwik.
piwik:
image: piwik:3.2-fpm
# Matomo.
matomo:
image: matomo:3.5-fpm

piwik_web:
matomo_web:
extends:
file: ./docker-compose-common.yml
service: piwik_nginx
service: matomo_nginx
labels:
- "traefik.enable=true"
- "traefik.frontend.rule=Host:${PIWIK_TRAEFIK_FRONTEND_RULE_HOSTNAME:-piwik.ddp8.docker.localhost}"
- "traefik.frontend.rule=Host:${MATOMO_TRAEFIK_FRONTEND_RULE_HOSTNAME:-matomo.ddp8.docker.localhost}"
volumes_from:
- piwik
- matomo

piwik_mysql:
matomo_mysql:
extends:
file: ./docker-compose-common.yml
service: mysql
environment:
MYSQL_USER: piwik
MYSQL_PASSWORD: piwik
MYSQL_DATABASE: piwik
MYSQL_USER: matomo
MYSQL_PASSWORD: matomo
MYSQL_DATABASE: matomo
volumes:
- ./data/piwik_db:/var/lib/mysql
- ./data/matomo_db:/var/lib/mysql
@@ -1,4 +1,4 @@
DRUPAL_TRAEFIK_FRONTEND_RULE_HOSTNAME=web.ddp8.docker.localhost
VARNISH_TRAEFIK_FRONTEND_RULE_HOSTNAME=varnish.ddp8.docker.localhost
MAIL_TRAEFIK_FRONTEND_RULE_HOSTNAME=mail.ddp8.docker.localhost
PIWIK_TRAEFIK_FRONTEND_RULE_HOSTNAME=piwik.ddp8.docker.localhost
MATOMO_TRAEFIK_FRONTEND_RULE_HOSTNAME=matomo.ddp8.docker.localhost

0 comments on commit 24395f7

Please sign in to comment.
You can’t perform that action at this time.