Service: use user textsecure-cli

diff --git a/README.md b/README.md
index b3c9398249fe646aded88ed91a549cf982ea3861..634fa30fff21784d2bd59a08b1993013adfbd337 100644 (file)
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ For dbus support you need jni/unix-java.so installed on your system (Debian: lib
 ### System bus
 
 To run on the system bus you need to take some additional steps.
 ### System bus
 
 To run on the system bus you need to take some additional steps.

-It’s advisable to run textsecure-cli as a separate unix user, the following steps assume you created a user named *textsecure*.
+It’s advisable to run textsecure-cli as a separate unix user, the following steps assume you created a user named *textsecure-cli*.

 These steps, executed as root, should work on all distributions using systemd.
 
 ```bash
 These steps, executed as root, should work on all distributions using systemd.
 
 ```bash

diff --git a/data/org.asamk.TextSecure.conf b/data/org.asamk.TextSecure.conf
index 5267a799a69af15ba97c9d53b099f4e279575b01..798837530fbd8b30aa4db611a5216ef6c217bdc2 100644 (file)
--- a/data/org.asamk.TextSecure.conf
+++ b/data/org.asamk.TextSecure.conf
@@ -3,7 +3,7 @@
         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 
 <busconfig>
         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 
 <busconfig>

-        <policy user="textsecure">
+        <policy user="textsecure-cli">

                 <allow own="org.asamk.TextSecure"/>
                 <allow send_destination="org.asamk.TextSecure"/>
                 <allow receive_sender="org.asamk.TextSecure"/>
                 <allow own="org.asamk.TextSecure"/>
                 <allow send_destination="org.asamk.TextSecure"/>
                 <allow receive_sender="org.asamk.TextSecure"/>

diff --git a/data/textsecure.service b/data/textsecure.service
index 2ed892ce05238b36c62ec8cc8bbaa713c1ef43c7..abdb076719cf5d779a668e0729ca481b487952aa 100644 (file)
--- a/data/textsecure.service
+++ b/data/textsecure.service
@@ -4,7 +4,7 @@ Description=Send secure messages to TextSecure/Signal clients
 [Service]
 Type=dbus
 ExecStart=%dir%/bin/textsecure-cli -u %number% daemon --system
 [Service]
 Type=dbus
 ExecStart=%dir%/bin/textsecure-cli -u %number% daemon --system

-User=textsecure
+User=textsecure-cli

 BusName=org.asamk.TextSecure
 
 [Install]
 BusName=org.asamk.TextSecure
 
 [Install]