Skip to content

Commit

Permalink
fix DATABASE_URL examples
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinpapst committed Dec 26, 2023
1 parent 3a83f79 commit 53155aa
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion _documentation/developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ You need to change your environment to `dev` and configure your database connect

```
APP_ENV=dev
DATABASE_URL=mysql://user:[email protected]:3306/database?charset=utf8mb4&serverVersion=5.7
DATABASE_URL=mysql://user:[email protected]: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,
Expand Down
10 changes: 5 additions & 5 deletions _documentation/docker/docker-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
environment:
- [email protected]
- 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
- [email protected]
Expand Down Expand Up @@ -129,7 +129,7 @@ services:
environment:
- [email protected]
- 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
```
Expand Down Expand Up @@ -167,7 +167,7 @@ services:
environment:
- [email protected]
- 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

Expand Down Expand Up @@ -219,7 +219,7 @@ services:
environment:
- [email protected]
- 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
Expand Down Expand Up @@ -276,7 +276,7 @@ services:
environment:
- [email protected]
- 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
Expand Down
4 changes: 2 additions & 2 deletions _documentation/docker/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _documentation/fresh-ubuntu-18.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]:3306/kimai2?charset=utf8mb4&serverVersion=5.7
DATABASE_URL=mysql://kimai2:[email protected]:3306/kimai2?charset=utf8mb4&serverVersion=5.7.40
```

And execute the Kimai installation:
Expand Down
2 changes: 1 addition & 1 deletion _documentation/fresh-ubuntu-20.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]:3306/kimai2?charset=utf8mb4&serverVersion=5.7
DATABASE_URL=mysql://kimai2:[email protected]:3306/kimai2?charset=utf8mb4&serverVersion=5.7.40
```


Expand Down
4 changes: 2 additions & 2 deletions _documentation/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ composer install --optimize-autoloader -n

Configure the database connection and server version in the `.env` file:
```
DATABASE_URL=mysql://user:[email protected]:3306/database?charset=utf8mb4&serverVersion=5.7
DATABASE_URL=mysql://user:[email protected]:3306/database?charset=utf8mb4&serverVersion=5.7.40
```

And run the Kimai installer:
Expand Down Expand Up @@ -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%[email protected]:3306/kimai2?charset=utf8mb4&serverVersion=5.7
DATABASE_URL=mysql://root:mG0%2Fd1%403aT.Z%[email protected]:3306/kimai2?charset=utf8mb4&serverVersion=5.7.40
```

### Which user to use, www-data, httpd or your own?
Expand Down
2 changes: 1 addition & 1 deletion _documentation/synology.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion _documentation/webserver-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <app-secret-id>
#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"
</VirtualHost>
```

Expand Down

0 comments on commit 53155aa

Please sign in to comment.