diff --git a/webtrees/config.json b/webtrees/config.json index ff98780e0..126c73773 100644 --- a/webtrees/config.json +++ b/webtrees/config.json @@ -3,10 +3,15 @@ "boot": "auto", "description": "web's leading on-line collaborative genealogy application", "environment": { - "PORT": "80", - "WEBTREES_HOME": "/data/webtrees", + "PORT": "80", + "WEBTREES_HOME": "/data/webtrees", "DB_PREFIX": "wt_", - "PRETTY_URLS": "0" + "PRETTY_URLS": "0", + "DB_HOST": "http://127.0.0.1", + "DB_PORT": "80", + "DB_USER": "databaseuser", + "DB_PASS": "databasepassword", + "DB_NAME": "webtrees" }, "map": [ "share:rw", @@ -17,11 +22,6 @@ "LANG": "en-US", "BASE_URL": "http://192.168.178.69:9999", "DB_TYPE": "sqlite", - "DB_HOST": "http://127.0.0.1", - "DB_PORT": "80", - "DB_USER": "test", - "DB_PASS": "test", - "DB_NAME": "webtrees", "WT_USER": "username", "WT_NAME": "Full Name", "WT_PASS": "mybadpassword", @@ -38,15 +38,7 @@ "schema": { "LANG": "str", "BASE_URL": "url", - "DB_TYPE": "list(sqlite|pgsql|mysql)", - "DB_HOST": "url", - "DB_PORT": "int", - "DB_USER": "str", - "MYSQL_USER": "str?", - "DB_PASS": "str", - "MYSQL_PASSWORD": "str?", - "DB_NAME": "str", - "MYSQL_DATABASE": "str?", + "DB_TYPE": "list(sqlite|other)", "WT_USER": "str", "WT_NAME": "str", "WT_PASS": "str",