audio/murmur: Fix for clean installs

Config file in 1.3.0 does not specify logfile location and attempts to
write murmur.log to $PWD. Specify path for log and pidfile by patching
sample config file.

Also support reloading service via SIGUSR1 so TLS cert/key updates can
be deployed without restarting server.

MFH:		2019Q4
This commit is contained in:
Mark Felder 2019-10-22 15:10:42 +00:00
parent 56b8251210
commit 284d0954a2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=515199
4 changed files with 32 additions and 12 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= murmur
PORTVERSION= 1.3.0
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= audio net
MAINTAINER= feld@FreeBSD.org

View File

@ -29,6 +29,8 @@ command="%%PREFIX%%/sbin/murmurd"
command_args="-ini %%PREFIX%%/etc/murmur.ini"
pidfile=/var/run/murmur/murmur.pid
start_precmd=murmur_prestart
extra_commands="reload"
sig_reload="USR1"
murmur_prestart() {
for i in /var/log/murmur /var/run/murmur /var/db/murmur; do

View File

@ -8,27 +8,27 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804363
Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1876
Last-Updated: 2015-11-10
--- src/mumble/main.cpp.orig 2015-07-09 13:23:46 UTC
--- src/mumble/main.cpp.orig 2019-08-30 01:01:56 UTC
+++ src/mumble/main.cpp
@@ -170,6 +170,9 @@ int main(int argc, char **argv) {
@@ -132,6 +132,9 @@ int main(int argc, char **argv) {
os_init();
#endif
+ SSL_library_init();
+ SSL_load_error_strings();
+
bool bAllowMultiple = false;
QUrl url;
if (a.arguments().count() > 1) {
--- src/murmur/main.cpp.orig 2015-07-09 13:23:46 UTC
bool suppressIdentity = false;
bool customJackClientName = false;
--- src/murmur/main.cpp.orig 2019-08-30 01:01:56 UTC
+++ src/murmur/main.cpp
@@ -203,6 +203,9 @@ int main(int argc, char **argv) {
qsrand(QDateTime::currentDateTime().toTime_t());
qInstallMsgHandler(murmurMessageOutput);
@@ -205,6 +205,9 @@ int main(int argc, char **argv) {
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
#endif
+ SSL_library_init();
+ SSL_load_error_strings();
+
#ifdef Q_OS_WIN
Tray tray(NULL, &le);
#endif
// By default, windbus expects the path to dbus-daemon to be in PATH, and the path
// should contain bin\\, and the path to the config is hardcoded as ..\etc

View File

@ -0,0 +1,18 @@
--- scripts/murmur.ini.orig 2019-10-22 15:01:53 UTC
+++ scripts/murmur.ini
@@ -102,13 +102,13 @@ icesecretwrite=
; logs to the file 'murmur.log'. If you leave this field blank
; on Unix-like systems, Murmur will force itself into foreground
; mode which logs to the console.
-;logfile=murmur.log
+logfile=/var/log/murmur/murmur.log
; If set, Murmur will write its process ID to this file
; when running in daemon mode (when the -fg flag is not
; specified on the command line). Only available on
; Unix-like systems.
-;pidfile=
+pidfile=/var/run/murmur/murmur.pid
; The below will be used as defaults for new configured servers.
; If you're just running one server (the default), it's easier to