pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

coturn: Fix non-root user



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jan 19 19:26:08 2025 -0500
Changeset:	485d6bed8d38924d6565909e3c89c64859a5c311

Modified Files:
	coturn/Makefile
	coturn/files/turnserver.sh

Log Message:
coturn: Fix non-root user

(twisty maze of variables, SUBST, and files)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=485d6bed8d38924d6565909e3c89c64859a5c311

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coturn/Makefile            | 4 ++++
 coturn/files/turnserver.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs:
diff --git a/coturn/Makefile b/coturn/Makefile
index 1279f46143..62655f63df 100644
--- a/coturn/Makefile
+++ b/coturn/Makefile
@@ -37,6 +37,10 @@ PKG_SHELL.${COTURN_USER}=	${NOLOGIN}
 
 RCD_SCRIPTS=		turnserver
 
+FILES_SUBST+=	COTURN_USER=${COTURN_USER:Q}
+FILES_SUBST+=	COTURN_GROUP=${COTURN_GROUP:Q}
+FILES_SUBST+=	COTURN_DATA=${COTURN_DATA:Q}
+
 # Pass cflags/libs
 CONFIGURE_ENV+=		PTHREAD_LIBS=-pthread TURN_DISABLE_RPATH=1
 CONFIGURE_ENV+=		LIBEVENT_OPENSSL_CFLAGS="-I${BUILDLINK_PREFIX.libevent}/include"
diff --git a/coturn/files/turnserver.sh b/coturn/files/turnserver.sh
index 7ee7a1ca0e..46e7528811 100644
--- a/coturn/files/turnserver.sh
+++ b/coturn/files/turnserver.sh
@@ -20,9 +20,9 @@ name="turnserver"
 rcvar=$name
 
 : ${turnserver:=no}
-: ${turnserver_config=@PREFIX@/etc/turnserver.conf}
+: ${turnserver_config=@COTURN_DATA@/turnserver.conf}
 : ${coturn_user:=@COTURN_USER@}
-: ${synapse_group:=@SYNAPSE_GROUP@}
+: ${coturn_group:=@COTURN_GROUP@}
 
 load_rc_config $name
 


Home | Main Index | Thread Index | Old Index