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 51575fbcf4a6b4396cb98e19014b1e2136884095..eb2b2b9ba5c6d795ebb89a3f20bd9defe26e956f 100644 (file)
--- 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 0f9466c0391d8db22dbbd3126137b93fe572c2a9..3dd97fe7e6ff4ee762834c0b36db9eb5ce8d6c56 100644 (file)
--- 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 4ce570f475d7af79313b8060422b18a7e2319540..7da7a0ad866cf52d1a272a5db70c41e93bba2365 100644 (file)
--- 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"/>