tcjlj/nginx-proxy-manager-zh
1
0
Fork 0
mirror of https://github.com/xiaoxinpro/nginx-proxy-manager-zh.git synced 2025-02-02 09:48:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1122 from jc21/fixes-some-database-issues

Browse Source 
Fixes some database issues on raspberry pi
This commit is contained in:
jc21 2021-05-31 08:43:28 +10:00 committed by GitHub
commit 0e9cd5db9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/index.js
View File

@ -95,7 +95,8 @@ async function createDbConfigFromEnvironment() {
client: 'sqlite3', client: 'sqlite3',
connection: { connection: {
filename: envSqliteFile filename: envSqliteFile
} },
useNullAsDefault: true
} }
}; };
if (JSON.stringify(configData.database) === JSON.stringify(newConfig)) { if (JSON.stringify(configData.database) === JSON.stringify(newConfig)) {

10
docs/setup/README.md
View File

@ -122,18 +122,15 @@ services:
depends_on: depends_on:
- db - db
db: db:
image: ghcr.io/linuxserver/mariadb image: yobasystems/alpine-mariadb:latest
restart: unless-stopped restart: unless-stopped
environment: environment:
PUID: 1001
PGID: 1001
TZ: "Europe/London"
MYSQL_ROOT_PASSWORD: "changeme" MYSQL_ROOT_PASSWORD: "changeme"
MYSQL_DATABASE: "npm" MYSQL_DATABASE: "npm"
MYSQL_USER: "changeuser" MYSQL_USER: "changeuser"
MYSQL_PASSWORD: "changepass" MYSQL_PASSWORD: "changepass"
volumes: volumes:
- ./data/mariadb:/config - ./data/mariadb:/var/lib/mysql
``` ```
_Please note, that `DB_MYSQL_*` environment variables will take precedent over `DB_SQLITE_*` var> _Please note, that `DB_MYSQL_*` environment variables will take precedent over `DB_SQLITE_*` var>
@ -185,7 +182,8 @@ Here's an example for `sqlite` configuration as it is generated from the environ
"client": "sqlite3", "client": "sqlite3",
"connection": { "connection": {
"filename": "/data/database.sqlite" "filename": "/data/database.sqlite"
} },
"useNullAsDefault": true
} }
} }
} }