From a211b960a7590910b46c1d59acaeda5e87b5b522 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@ring0.de>
Date: Sun, 16 Apr 2017 01:19:16 +0200
Subject: all: switch from session to system bus

---
 dbus/Makefile                                           |  4 +++-
 dbus/config/Makefile                                    | 15 +++++++++++++++
 dbus/config/io.mainframe.shopsystem.AudioPlayer.conf    | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.Config.conf         | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.Database.conf       | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.InputDevice.conf    | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.InvoicePDF.conf     | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.Mail.conf           | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.PGP.conf            | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.ScannerSession.conf | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.SerialDevice.conf   | 17 +++++++++++++++++
 dbus/config/io.mainframe.shopsystem.StockPDF.conf       | 17 +++++++++++++++++
 dbus/io.mainframe.shopsystem.AudioPlayer.service.in     |  1 +
 dbus/io.mainframe.shopsystem.Config.service.in          |  1 +
 dbus/io.mainframe.shopsystem.Database.service.in        |  1 +
 dbus/io.mainframe.shopsystem.InputDevice.service.in     |  4 ++++
 dbus/io.mainframe.shopsystem.InvoicePDF.service.in      |  1 +
 dbus/io.mainframe.shopsystem.Mail.service.in            |  1 +
 dbus/io.mainframe.shopsystem.PGP.service.in             |  1 +
 dbus/io.mainframe.shopsystem.ScannerSession.service.in  |  1 +
 dbus/io.mainframe.shopsystem.SerialDevice.service.in    |  1 +
 dbus/io.mainframe.shopsystem.StockPDF.service.in        |  1 +
 22 files changed, 201 insertions(+), 1 deletion(-)
 create mode 100644 dbus/config/Makefile
 create mode 100644 dbus/config/io.mainframe.shopsystem.AudioPlayer.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.Config.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.Database.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.InputDevice.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.InvoicePDF.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.Mail.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.PGP.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.ScannerSession.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.SerialDevice.conf
 create mode 100644 dbus/config/io.mainframe.shopsystem.StockPDF.conf
 create mode 100644 dbus/io.mainframe.shopsystem.InputDevice.service.in

(limited to 'dbus')

diff --git a/dbus/Makefile b/dbus/Makefile
index a18cd2e..31d22b3 100644
--- a/dbus/Makefile
+++ b/dbus/Makefile
@@ -1,6 +1,6 @@
 SERVICEFILESIN=$(wildcard *.service.in)
 SERVICEFILES=$(basename ${SERVICEFILESIN})
-INSTALLPATH=/usr/share/dbus-1/services/
+INSTALLPATH=/usr/share/dbus-1/system-services/
 BINARYPATH=$(realpath $(dir $(lastword $(MAKEFILE_LIST)))/../src)
 ESCAPEDBINARYPATH=
 
@@ -14,10 +14,12 @@ install: ${SERVICEFILES}
 	@echo Installing DBus service files into ${INSTALLPATH}...
 	@mkdir -p ${INSTALLPATH}
 	@$(foreach file,${SERVICEFILES},install -m644 ${file} ${INSTALLPATH}/${file};)
+	@cd config && make install
 
 uninstall:
 	@echo Remove DBus service files from ${INSTALLPATH}...
 	@$(foreach file,${SERVICEFILES},rm -f ${INSTALLPATH}/${file};)
+	@cd config && make uninstall
 
 clean:
 	@rm -f ${SERVICEFILES}
diff --git a/dbus/config/Makefile b/dbus/config/Makefile
new file mode 100644
index 0000000..99083ab
--- /dev/null
+++ b/dbus/config/Makefile
@@ -0,0 +1,15 @@
+CONFIGFILES=$(wildcard *.conf)
+INSTALLPATH=/etc/dbus-1/system.d
+
+all:
+
+install: ${CONFIGFILES}
+	@echo Installing DBus config files into ${INSTALLPATH}...
+	@mkdir -p ${INSTALLPATH}
+	@$(foreach file,${CONFIGFILES},install -m644 ${file} ${INSTALLPATH}/${file};)
+
+uninstall:
+	@echo Remove DBus config files from ${INSTALLPATH}...
+	@$(foreach file,${CONFIGFILES},rm -f ${INSTALLPATH}/${file};)
+
+.PHONY: all install uninstall
diff --git a/dbus/config/io.mainframe.shopsystem.AudioPlayer.conf b/dbus/config/io.mainframe.shopsystem.AudioPlayer.conf
new file mode 100644
index 0000000..b8c11c0
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.AudioPlayer.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.AudioPlayer"/>
+		<allow send_destination="io.mainframe.shopsystem.AudioPlayer"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.AudioPlayer"/>
+		<allow send_destination="io.mainframe.shopsystem.AudioPlayer"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.Config.conf b/dbus/config/io.mainframe.shopsystem.Config.conf
new file mode 100644
index 0000000..41e5cb6
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.Config.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.Config"/>
+		<allow send_destination="io.mainframe.shopsystem.Config"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.Config"/>
+		<allow send_destination="io.mainframe.shopsystem.Config"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.Database.conf b/dbus/config/io.mainframe.shopsystem.Database.conf
new file mode 100644
index 0000000..61bde19
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.Database.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.Database"/>
+		<allow send_destination="io.mainframe.shopsystem.Database"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.Database"/>
+		<allow send_destination="io.mainframe.shopsystem.Database"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.InputDevice.conf b/dbus/config/io.mainframe.shopsystem.InputDevice.conf
new file mode 100644
index 0000000..15ad43d
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.InputDevice.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.InputDevice"/>
+		<allow send_destination="io.mainframe.shopsystem.InputDevice"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.InputDevice"/>
+		<allow send_destination="io.mainframe.shopsystem.InputDevice"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.InvoicePDF.conf b/dbus/config/io.mainframe.shopsystem.InvoicePDF.conf
new file mode 100644
index 0000000..6ec4610
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.InvoicePDF.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.InvoicePDF"/>
+		<allow send_destination="io.mainframe.shopsystem.InvoicePDF"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.InvoicePDF"/>
+		<allow send_destination="io.mainframe.shopsystem.InvoicePDF"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.Mail.conf b/dbus/config/io.mainframe.shopsystem.Mail.conf
new file mode 100644
index 0000000..e48e264
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.Mail.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.Mail"/>
+		<allow send_destination="io.mainframe.shopsystem.Mail"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.Mail"/>
+		<allow send_destination="io.mainframe.shopsystem.Mail"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.PGP.conf b/dbus/config/io.mainframe.shopsystem.PGP.conf
new file mode 100644
index 0000000..ab2f8b2
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.PGP.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.PGP"/>
+		<allow send_destination="io.mainframe.shopsystem.PGP"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.PGP"/>
+		<allow send_destination="io.mainframe.shopsystem.PGP"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.ScannerSession.conf b/dbus/config/io.mainframe.shopsystem.ScannerSession.conf
new file mode 100644
index 0000000..49c4eb1
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.ScannerSession.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.ScannerSession"/>
+		<allow send_destination="io.mainframe.shopsystem.ScannerSession"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.ScannerSession"/>
+		<allow send_destination="io.mainframe.shopsystem.ScannerSession"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.SerialDevice.conf b/dbus/config/io.mainframe.shopsystem.SerialDevice.conf
new file mode 100644
index 0000000..d849ef4
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.SerialDevice.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.SerialDevice"/>
+		<allow send_destination="io.mainframe.shopsystem.SerialDevice"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.SerialDevice"/>
+		<allow send_destination="io.mainframe.shopsystem.SerialDevice"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/config/io.mainframe.shopsystem.StockPDF.conf b/dbus/config/io.mainframe.shopsystem.StockPDF.conf
new file mode 100644
index 0000000..8cf0fdc
--- /dev/null
+++ b/dbus/config/io.mainframe.shopsystem.StockPDF.conf
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+	<policy user="root">
+		<allow own="io.mainframe.shopsystem.StockPDF"/>
+		<allow send_destination="io.mainframe.shopsystem.StockPDF"/>
+	</policy>
+
+	<policy user="shop">
+		<allow own="io.mainframe.shopsystem.StockPDF"/>
+		<allow send_destination="io.mainframe.shopsystem.StockPDF"/>
+	</policy>
+
+</busconfig>
diff --git a/dbus/io.mainframe.shopsystem.AudioPlayer.service.in b/dbus/io.mainframe.shopsystem.AudioPlayer.service.in
index 3629cae..b6a0c83 100644
--- a/dbus/io.mainframe.shopsystem.AudioPlayer.service.in
+++ b/dbus/io.mainframe.shopsystem.AudioPlayer.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.AudioPlayer
 Exec=${PATH}/audio/audio
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.Config.service.in b/dbus/io.mainframe.shopsystem.Config.service.in
index b2cdb7e..8203523 100644
--- a/dbus/io.mainframe.shopsystem.Config.service.in
+++ b/dbus/io.mainframe.shopsystem.Config.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.Config
 Exec=${PATH}/config/config
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.Database.service.in b/dbus/io.mainframe.shopsystem.Database.service.in
index 02674ed..1461477 100644
--- a/dbus/io.mainframe.shopsystem.Database.service.in
+++ b/dbus/io.mainframe.shopsystem.Database.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.Database
 Exec=${PATH}/database/database
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.InputDevice.service.in b/dbus/io.mainframe.shopsystem.InputDevice.service.in
new file mode 100644
index 0000000..b761d7d
--- /dev/null
+++ b/dbus/io.mainframe.shopsystem.InputDevice.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=io.mainframe.shopsystem.InputDevice
+Exec=${PATH}/input-device/input-device
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.InvoicePDF.service.in b/dbus/io.mainframe.shopsystem.InvoicePDF.service.in
index a41a69f..9da0a00 100644
--- a/dbus/io.mainframe.shopsystem.InvoicePDF.service.in
+++ b/dbus/io.mainframe.shopsystem.InvoicePDF.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.InvoicePDF
 Exec=${PATH}/pdf-invoice/pdf-invoice
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.Mail.service.in b/dbus/io.mainframe.shopsystem.Mail.service.in
index 6788453..1f0d2d1 100644
--- a/dbus/io.mainframe.shopsystem.Mail.service.in
+++ b/dbus/io.mainframe.shopsystem.Mail.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.Mail
 Exec=${PATH}/mail/mailer
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.PGP.service.in b/dbus/io.mainframe.shopsystem.PGP.service.in
index 29bca05..3c5dc88 100644
--- a/dbus/io.mainframe.shopsystem.PGP.service.in
+++ b/dbus/io.mainframe.shopsystem.PGP.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.PGP
 Exec=${PATH}/pgp/pgp
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.ScannerSession.service.in b/dbus/io.mainframe.shopsystem.ScannerSession.service.in
index 97e7966..974d33c 100644
--- a/dbus/io.mainframe.shopsystem.ScannerSession.service.in
+++ b/dbus/io.mainframe.shopsystem.ScannerSession.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.ScannerSession
 Exec=${PATH}/scanner-session/scanner-session
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.SerialDevice.service.in b/dbus/io.mainframe.shopsystem.SerialDevice.service.in
index 4574f0b..3cac817 100644
--- a/dbus/io.mainframe.shopsystem.SerialDevice.service.in
+++ b/dbus/io.mainframe.shopsystem.SerialDevice.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.SerialDevice
 Exec=${PATH}/serial-device/serial-device
+User=shop
diff --git a/dbus/io.mainframe.shopsystem.StockPDF.service.in b/dbus/io.mainframe.shopsystem.StockPDF.service.in
index a0d5ebd..06b2953 100644
--- a/dbus/io.mainframe.shopsystem.StockPDF.service.in
+++ b/dbus/io.mainframe.shopsystem.StockPDF.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=io.mainframe.shopsystem.StockPDF
 Exec=${PATH}/pdf-stock/pdf-stock
+User=shop
-- 
cgit v1.2.3