fix(config): Include custom configuration in global file

Previously, this formula generated two configuration files,
a global one for database and secrets setup and
a custom one for all other settings in `custom/conf/app.ini`.

This did not work as intended.
This commit is contained in:
jeanluc
2022-05-10 13:27:01 +02:00
parent d21bbac35c
commit 670dc9c945
35 changed files with 398 additions and 385 deletions

View File

@@ -58,34 +58,36 @@
},
"_settings": {
"version": "latest",
"database": {
"db_type": "sqlite3",
"name": "gitea",
"user": "root",
"password": "hunter1"
},
"secrets": {
"internal_token": "",
"jwt_secret": "",
"lfs_jwt_secret": "",
"secret_key": ""
},
"service": {
"requires_mount": [],
"socket_activation": false,
"wants": []
},
"config": {
"database": {
"db_type": "sqlite3",
"name": "gitea",
"user": "root",
"password": "hunter1"
},
"default": {
"app_name": "Gitea",
"run_user": "git",
"run_mode": "prod"
},
"oauth2": {
"jwt_secret": ""
},
"security": {
"internal_token": "",
"secret_key": ""
},
"server": {
"protocol": "http",
"domain": "localhost",
"http_addr": "0.0.0.0",
"http_port": 3000
"http_port": 3000,
"lfs_jwt_secret": ""
},
"log": {
"mode": "console",