From 92a52ccdf7e60a424688b1a030d2ce8734b16221 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 19 Aug 2016 14:48:40 +0200 Subject: [PATCH] docs(conf): add more info about using database.url --- conf/defaults.ini | 3 +++ conf/sample.ini | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/conf/defaults.ini b/conf/defaults.ini index 45394801014..18b83969b6f 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -59,6 +59,9 @@ cert_key = #################################### Database #################################### [database] +# You can configure the database connection by specifying type, host, name, user and password +# as seperate properties or as on string using the url propertie. + # Either "mysql", "postgres" or "sqlite3", it's your choice type = sqlite3 host = 127.0.0.1:3306 diff --git a/conf/sample.ini b/conf/sample.ini index 3978408e24e..9e0e34fb8a9 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -61,6 +61,9 @@ #################################### Database #################################### [database] +# You can configure the database connection by specifying type, host, name, user and password +# as seperate properties or as on string using the url propertie. + # Either "mysql", "postgres" or "sqlite3", it's your choice ;type = sqlite3 ;host = 127.0.0.1:3306 @@ -68,6 +71,10 @@ ;user = root ;password = +# Use either URL or the previous fields to configure the database +# Example: mysql://user:secret@host:port/database +;url = + # For "postgres" only, either "disable", "require" or "verify-full" ;ssl_mode = disable