From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 24 Feb 2026 17:01:08 +0000 (+0000)
Subject: dbus: Update policy so that the unprivileged user can connect
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26ee0beb1bc783352ed484d453764e33039ea1fe;p=telemetry.git

dbus: Update policy so that the unprivileged user can connect

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/.gitignore b/.gitignore
index 51575fb..eb2b2b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /man/*.[0-9]
 /man/*.html
 /missing
+/src/dbus/org.ipfire.telemetry1.conf
 /src/systemd/telemetryd.service
 /telemetryd
 /telemetry-graph
diff --git a/Makefile.am b/Makefile.am
index 0f9466c..3dd97fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -304,7 +304,13 @@ telemetry_graph_LDADD = \
 
 # ------------------------------------------------------------------------------
 
-dist_dbuspolicy_DATA = \
+dbuspolicy_DATA = \
+	src/dbus/org.ipfire.telemetry1.conf
+
+EXTRA_DIST += \
+	src/dbus/org.ipfire.telemetry1.conf.in
+
+CLEANFILES += \
 	src/dbus/org.ipfire.telemetry1.conf
 
 dist_dbussystemservice_DATA = \
@@ -379,6 +385,7 @@ endif
 substitutions = \
 	'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
 	'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
+	'|DAEMON_USER=$(DAEMON_USER)|' \
 	'|configsdir=$(configsdir)|' \
 	'|bindir=$(bindir)|' \
 	'|sbindir=$(sbindir)|'
@@ -388,5 +395,5 @@ SED_PROCESS = \
 	$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
 		< $< > $@
 
-src/systemd/%: src/systemd/%.in Makefile
+%: %.in Makefile
 	$(SED_PROCESS)
diff --git a/src/dbus/org.ipfire.telemetry1.conf b/src/dbus/org.ipfire.telemetry1.conf.in
similarity index 96%
rename from src/dbus/org.ipfire.telemetry1.conf
rename to src/dbus/org.ipfire.telemetry1.conf.in
index 4ce570f..7da7a0a 100644
--- a/src/dbus/org.ipfire.telemetry1.conf
+++ b/src/dbus/org.ipfire.telemetry1.conf.in
@@ -12,7 +12,7 @@
 -->
 
 <busconfig>
-	<policy user="root">
+	<policy user="@DAEMON_USER@">
 		<allow own="org.ipfire.telemetry1"/>
 		<allow send_destination="org.ipfire.telemetry1"/>
 		<allow receive_sender="org.ipfire.telemetry1"/>