Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ MATOMO_FIRST_SITE_NAME=test
MATOMO_FIRST_SITE_URL=https://www.matomo.test
MATOMO_FIRST_USER_NAME=uuadmin
MATOMO_FIRST_USER_EMAIL=yoda@uu.nl
MATOMO_FIRST_USER_PASSWORD=admin
MATOMO_FIRST_USER_PASSWORD=adminadmin # must be at least 6 characters

# Database configuration
MARIADB_PASSWORD=testtest
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
- matomo_config:/var/www/html/matomo/config:z
- matomo_tmp_data:/var/www/html/matomo/tmp:Z
environment:
- MATOMO_DATABASE_ADAPTER=mysql
- MATOMO_DATABASE_ADAPTER=mysqli
- MATOMO_DATABASE_DBNAME=matomo
- MATOMO_DATABASE_HOST=database
- MATOMO_DATABASE_PASSWORD=${MARIADB_PASSWORD}
Expand Down
26 changes: 15 additions & 11 deletions docker/images/matomo/matomo-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,21 @@ then before_update "Setting up Apache vhost"
perl -pi -e '$servername=$ENV{MATOMO_HOST}; s/SERVERNAME/$servername/' /etc/apache2/sites-available/001-matomo.conf
before_update "Initializing Matomo."
cd /var/www/html/matomo
./console matomo:install --no-interaction \
--db-username="$MATOMO_DATABASE_USERNAME" \
--db-pass="MATOMO_DATABASE_PASSWORD" \
--db-host="$MATOMO_DATABASE_HOST" \
--db-port=3306 \
--db-name="$MATOMO_DATABASE_DBNAME" \
--first-site-name="$MATOMO_FIRST_SITE_NAME" \
--first-site-url="$MATOMO_FIRST_SITE_URL" \
--first-user="$MATOMO_FIRST_USER_NAME" \
--first-user-email="$MATOMO_FIRST_USER_EMAIL" \
--first-user-pass="$MATOMO_FIRST_USER_PASSWORD"
sudo -u www-data php console matomo:install --no-interaction --force -vvv \
--db-username="$MATOMO_DATABASE_USERNAME" \
--db-pass="$MATOMO_DATABASE_PASSWORD" \
--db-host="$MATOMO_DATABASE_HOST" \
--db-port=3306 \
--db-name="$MATOMO_DATABASE_DBNAME" \
--db-prefix="${MATOMO_DATABASE_TABLES_PREFIX:-matomo_}" \
--db-adapter="${MATOMO_DATABASE_ADAPTER:-mysqli}" \
--db-collation=utf8mb4_general_ci \
--db-charset=utf8mb4 \
--first-site-name="$MATOMO_FIRST_SITE_NAME" \
--first-site-url="$MATOMO_FIRST_SITE_URL" \
--first-user="$MATOMO_FIRST_USER_NAME" \
--first-user-email="$MATOMO_FIRST_USER_EMAIL" \
--first-user-pass="$MATOMO_FIRST_USER_PASSWORD"
crudini --set /var/www/html/matomo/config/config.ini.php General force_ssl 1
crudini --set /var/www/html/matomo/config/config.ini.php General assume_secure_protocol 1
crudini --set /var/www/html/matomo/config/config.ini.php General proxy_client_headers[] HTTP_X_FORWARDED_FOR
Expand Down