diff --git a/auxiliary_files/mumble-server.ini b/auxiliary_files/mumble-server.ini index 9722b444539..e778127e363 100644 --- a/auxiliary_files/mumble-server.ini +++ b/auxiliary_files/mumble-server.ini @@ -11,10 +11,22 @@ ; NOT variable = """ BUT variable = "\"" ; NOT regex = \w* BUT regex = \\w* -; Path to database. If blank, will search for -; mumble-server.sqlite in default locations or create it if not found. +; When using SQLite: Path to database. If blank, will search for +; mumble-server.sqlite in default locations or create it if not found. +; Otherwise: The name of the database to use for the Mumble server. database= +; Selects the database to use. Possible values are +; - sqlite (default) +; - mysql +; - postgresql +;dbDriver=postgresql + +;dbUsername= +;dbPassword= +;dbHost= +;dbPort= + ; The server defaults to using SQLite with its default rollback journal. ; In some situations, using SQLite's write-ahead log (WAL) can be ; advantageous. @@ -25,29 +37,12 @@ database= ; values: ; ; 0 - Use SQLite's default rollback journal. -; 1 - Use write-ahead log with synchronous=NORMAL. -; If the server crashes, the database will be in a consistent state, but -; the most recent changes might be lost if the operating system did -; not write them to disk yet. This option can improve the server's -; interactivity on busy servers, or servers with slow storage. +; 1 - No longer supported! ; 2 - Use write-ahead log with synchronous=FULL. ; All database writes are synchronized to disk when they are made. ; If the server crashes, the database will be include all completed writes. ;sqlite_wal=0 -; If you wish to use something other than SQLite, you'll need to set the name -; of the database above, and also uncomment the below. -; Sticking with SQLite is strongly recommended, as it's the most well tested -; and by far the fastest solution. -; -;dbDriver=QMYSQL -;dbUsername= -;dbPassword= -;dbHost= -;dbPort= -;dbPrefix=mumble-server_ -;dbOpts= - ; The server defaults to not using D-Bus. If you wish to use dbus, which is one of the ; RPC methods available in the server, please specify so here. ;