Ensembia/QRForge-selfhosted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'renegade/general-fixes' of github.com:0xRenegade/PHP-Dynamic-Qr-code into renegade/general-fixes

Browse Source
This commit is contained in:
0xRenegade
2022-09-23 23:01:05 -05:00
parent 70ec7afc90 1934c78251
commit 9b61284a1e
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/docker-compose.yml
-1
View File
@@ -23,7 +23,6 @@ services:
DATABASE_NAME: "qrcode" DATABASE_NAME: "qrcode"
DATABASE_USER: "qrcode" DATABASE_USER: "qrcode"
DATABASE_PASSWORD: "changeme" DATABASE_PASSWORD: "changeme"
DATABASE_PREFIX: ""
DATABASE_CHARSET: "utf8" DATABASE_CHARSET: "utf8"
volumes: volumes:
- ./data/app/config:/var/www/html/config - ./data/app/config:/var/www/html/config
qrcode/config/config.php
-1
View File
@@ -30,6 +30,5 @@ function getDbInstance() {
'password' => DATABASE_PASSWORD, 'password' => DATABASE_PASSWORD,
'db'=> DATABASE_NAME, 'db'=> DATABASE_NAME,
'port' => DATABASE_PORT, 'port' => DATABASE_PORT,
'prefix' => DATABASE_PREFIX,
'charset' => DATABASE_CHARSET)); 'charset' => DATABASE_CHARSET));
} }
qrcode/config/environment.php
+1 -1
View File
@@ -33,4 +33,4 @@ if(is_string($docker_cid)) {
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
?> ?>