From 53155aa31e67944930a70a07b53302023237cee6 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Tue, 26 Dec 2023 01:01:39 +0100 Subject: [PATCH] fix DATABASE_URL examples --- _documentation/developers.md | 2 +- _documentation/docker/docker-compose.md | 10 +++++----- _documentation/docker/docker.md | 4 ++-- _documentation/fresh-ubuntu-18.md | 2 +- _documentation/fresh-ubuntu-20.md | 2 +- _documentation/installation.md | 4 ++-- _documentation/synology.md | 2 +- _documentation/webserver-configuration.md | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/_documentation/developers.md b/_documentation/developers.md index 6aee338b7..14363028e 100644 --- a/_documentation/developers.md +++ b/_documentation/developers.md @@ -37,7 +37,7 @@ You need to change your environment to `dev` and configure your database connect ``` APP_ENV=dev -DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7 +DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7.40 ``` The next command will import demo data, to test the application in its full beauty - with different user accounts, diff --git a/_documentation/docker/docker-compose.md b/_documentation/docker/docker-compose.md index 02ac19365..36813403f 100644 --- a/_documentation/docker/docker-compose.md +++ b/_documentation/docker/docker-compose.md @@ -49,7 +49,7 @@ services: environment: - ADMINMAIL=admin@kimai.local - ADMINPASS=changemeplease - - DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8&serverVersion=5.7 + - DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8mb4&serverVersion=5.7.40 - TRUSTED_HOSTS=nginx,localhost,127.0.0.1 - MAILER_URL=smtp://mailer:1025 - MAILER_FROM=kimai@example.com @@ -129,7 +129,7 @@ services: environment: - ADMINMAIL=admin@kimai.local - ADMINPASS=changemeplease - - "DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8&serverVersion=5.7" + - "DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8mb4&serverVersion=5.7.40" - TRUSTED_HOSTS=nginx,localhost,127.0.0.1 restart: unless-stopped ``` @@ -167,7 +167,7 @@ services: environment: - ADMINMAIL=admin@kimai.local - ADMINPASS=changemeplease - - "DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8&serverVersion=5.7" + - "DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8mb4&serverVersion=5.7.40" - TRUSTED_HOSTS=nginx,localhost,127.0.0.1 restart: unless-stopped @@ -219,7 +219,7 @@ services: environment: - ADMINMAIL=admin@kimai.local - ADMINPASS=changemeplease - - "DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8&serverVersion=5.7" + - "DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8mb4&serverVersion=5.7.40" - TRUSTED_HOSTS=nginx,localhost,127.0.0.1 volumes: - public:/opt/kimai/public @@ -276,7 +276,7 @@ services: environment: - ADMINMAIL=admin@kimai.local - ADMINPASS=changemeplease - - "DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8&serverVersion=5.7" + - "DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai?charset=utf8mb4&serverVersion=5.7.40" - TRUSTED_HOSTS=nginx,localhost,127.0.0.1 volumes: - public:/opt/kimai/public diff --git a/_documentation/docker/docker.md b/_documentation/docker/docker.md index c1d60b7e0..ad22df822 100644 --- a/_documentation/docker/docker.md +++ b/_documentation/docker/docker.md @@ -33,7 +33,7 @@ Run the latest production build: docker run --rm --name kimai-test \ -ti \ -p 8001:8001 \ - -e DATABASE_URL=mysql://kimai:kimai@${HOSTNAME}:3399/kimai?charset=utf8&serverVersion=5.7 \ + -e DATABASE_URL=mysql://kimai:kimai@${HOSTNAME}:3399/kimai?charset=utf8mb4&serverVersion=5.7.40 \ kimai/kimai2:apache ``` @@ -75,7 +75,7 @@ memory_limit=512M See the Kimai and Symfony docs for more info on these. ```bash -DATABASE_URL=mysql://user:pass@hodt/dbname?charset=utf8&serverVersion=5.7 +DATABASE_URL=mysql://user:pass@hodt/dbname?charset=utf8mb4&serverVersion=5.7.40 APP_SECRET=change_this_to_something_unique TRUSTED_PROXIES=nginx,localhost,127.0.0.1 TRUSTED_HOSTS=nginx,localhost,127.0.0.1 diff --git a/_documentation/fresh-ubuntu-18.md b/_documentation/fresh-ubuntu-18.md index fec825411..c2b40f533 100644 --- a/_documentation/fresh-ubuntu-18.md +++ b/_documentation/fresh-ubuntu-18.md @@ -163,7 +163,7 @@ vim .env Configure the database connection and adjust the settings to your needs (compare with the [original .env file]({{ site.kimai_v2_repo }}/blob/main/.env.dist)): ``` -DATABASE_URL=mysql://kimai2:my-super-secret-password@127.0.0.1:3306/kimai2?charset=utf8mb4&serverVersion=5.7 +DATABASE_URL=mysql://kimai2:my-super-secret-password@127.0.0.1:3306/kimai2?charset=utf8mb4&serverVersion=5.7.40 ``` And execute the Kimai installation: diff --git a/_documentation/fresh-ubuntu-20.md b/_documentation/fresh-ubuntu-20.md index 10a03f7ae..b3a15e989 100644 --- a/_documentation/fresh-ubuntu-20.md +++ b/_documentation/fresh-ubuntu-20.md @@ -172,7 +172,7 @@ vim .env Configure the database connection and adjust the settings to your needs (compare with the [original .env file]({{ site.kimai_v2_repo }}/blob/main/.env.dist)): ``` -DATABASE_URL=mysql://kimai2:my-super-secret-password@127.0.0.1:3306/kimai2?charset=utf8mb4&serverVersion=5.7 +DATABASE_URL=mysql://kimai2:my-super-secret-password@127.0.0.1:3306/kimai2?charset=utf8mb4&serverVersion=5.7.40 ``` diff --git a/_documentation/installation.md b/_documentation/installation.md index f57febf65..2f6911775 100644 --- a/_documentation/installation.md +++ b/_documentation/installation.md @@ -60,7 +60,7 @@ composer install --optimize-autoloader -n Configure the database connection and server version in the `.env` file: ``` -DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7 +DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7.40 ``` And run the Kimai installer: @@ -172,7 +172,7 @@ mG0%2Fd1%403aT.Z%29s Then your `DATABASE_URL` might look like this: ``` -DATABASE_URL=mysql://root:mG0%2Fd1%403aT.Z%29s@127.0.0.1:3306/kimai2?charset=utf8mb4&serverVersion=5.7 +DATABASE_URL=mysql://root:mG0%2Fd1%403aT.Z%29s@127.0.0.1:3306/kimai2?charset=utf8mb4&serverVersion=5.7.40 ``` ### Which user to use, www-data, httpd or your own? diff --git a/_documentation/synology.md b/_documentation/synology.md index 92fa23503..e6ac47c1e 100644 --- a/_documentation/synology.md +++ b/_documentation/synology.md @@ -60,7 +60,7 @@ therefore the connection string in your `.env` file could look different from th default [installation]({% link _documentation/installation.md %}) docs: ``` -DATABASE_URL="mysql://kimai2:password@localhost:3307/kimai2?unix_socket=/run/mysqld/mysqld10.sock?charset=utf8mb4&serverVersion=5.7" +DATABASE_URL="mysql://kimai2:password@localhost:3307/kimai2?unix_socket=/run/mysqld/mysqld10.sock?charset=utf8mb4&serverVersion=5.7.40" ``` BTW: You find the MariaDB executable at `/volume1/@appstore/MariaDB10/usr/local/mariadb10/bin`. diff --git a/_documentation/webserver-configuration.md b/_documentation/webserver-configuration.md index 77d9a9650..56aa005e6 100644 --- a/_documentation/webserver-configuration.md +++ b/_documentation/webserver-configuration.md @@ -116,7 +116,7 @@ which needs to be allowed by Apache via `AllowOverride All`. # optionally set the value of the environment variables used in the application #SetEnv APP_ENV prod #SetEnv APP_SECRET - #SetEnv DATABASE_URL "mysql://db_user:db_pass@host:3306/db_name?charset=utf8mb4&serverVersion=5.7" + #SetEnv DATABASE_URL "mysql://db_user:db_pass@host:3306/db_name?charset=utf8mb4&serverVersion=5.7.40" ```