From 0c2fbfe5457d93d4ebe8548e5888d7c0d038e372 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 8 Oct 2019 13:28:41 +0200 Subject: [PATCH] use pgsql --- README.md | 29 +++++++++++++++++++++- rootfs/etc/confd/templates/murmur.ini.tmpl | 16 ++++++------ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 9af6704..69d158e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -Murmur server for [Mumble](https://wiki.mumble.info/wiki/Main_Page) +Murmur server for [Mumble](https://wiki.mumble.info/wiki/Main_Page) with +a postgre backend. # Volumes - `/var/lib/murmur` @@ -27,6 +28,32 @@ Maximum number of concurrent clients allowed. ## CERT_DOMAIN Name of the certificate domain. +## ROOT_NAME +- default: Root + +Name of the root channel. + +## DB_HOST +Database host. + +## DB_NAME +- default: moodle + +Database name. + +## DB_USER +- default: moodle + +Database user. + +## DB_PASSWORD +Password for the database user. + +## DB_PORT +- default: 5432 + +Database port. + # Ports - 64738 diff --git a/rootfs/etc/confd/templates/murmur.ini.tmpl b/rootfs/etc/confd/templates/murmur.ini.tmpl index a8fe6f8..460484b 100644 --- a/rootfs/etc/confd/templates/murmur.ini.tmpl +++ b/rootfs/etc/confd/templates/murmur.ini.tmpl @@ -13,19 +13,19 @@ # Path to database. If blank, will search for # murmur.sqlite in default locations or create it if not found. -database=/var/lib/murmur/murmur.sqlite +database={{ getenv "DB_NAME" "murmur" }} # 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=murmur_ +dbDriver=QPSQL +dbUsername={{ getenv "DB_USER" "murmur" }} +dbPassword={{ getenv "DB_PASSWORD" }} +dbHost={{ getenv "DB_HOST" }} +dbPort={{ getenv "DB_PORT" "5432" }} +dbPrefix=murmur_ #dbOpts= # Murmur defaults to not using D-Bus. If you wish to use dbus, which is one of the @@ -143,7 +143,7 @@ users={{getenv "MAX_USERS" "20"}} # addresses. # Only uncomment the 'registerName' parameter if you wish to give your "Root" channel a custom name. # -#registerName=Mumble Server +registerName={{ getenv "ROOT_NAME" "Root" }} #registerPassword=secret #registerUrl=http://mumble.sourceforge.net/ #registerHostname=