summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--wesnothd-1.6.service13
3 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8b7e2e0cacd4..0eaac5064a8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,7 +29,7 @@ pkgbase = wesnoth-1.6
source = wesnoth-1.6.appdata.xml
md5sums = 99f136647c5af1820d0132df08350965
md5sums = ec9cab718ba96b7a4c85c224f6b747c3
- md5sums = f314d848b4e78b43070a2ec3c2903806
+ md5sums = 6ba3f7977da5b5ccee8382c20dd7db4d
md5sums = 1018b1fae1a65d49bed1094ba0280d87
pkgname = wesnoth-1.6
diff --git a/PKGBUILD b/PKGBUILD
index 2835330074b6..6cea6878ce39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ source=("wesnoth-1.6.desktop"
md5sums=('99f136647c5af1820d0132df08350965'
'ec9cab718ba96b7a4c85c224f6b747c3'
- 'f314d848b4e78b43070a2ec3c2903806'
+ '6ba3f7977da5b5ccee8382c20dd7db4d'
'1018b1fae1a65d49bed1094ba0280d87')
PKGEXT='.pkg.tar'
diff --git a/wesnothd-1.6.service b/wesnothd-1.6.service
index 0939f1a3fb31..e451c7b66121 100644
--- a/wesnothd-1.6.service
+++ b/wesnothd-1.6.service
@@ -9,19 +9,22 @@ Conflicts=wesnothd.service wesnothd-1.0.servicewesnothd-1.2.service wesnothd-1.4
[Service]
# If wesnothd is started from within the game it runs under a different user.
# Deleting the pipe resets owner, group and mode.
-ExecStopPre=/bin/rm -f /run/wesnothd-1.6/socket
+ExecStartPre=/bin/rm -f /run/wesnothd-1.6/socket
-ExecStart=/usr/bin/wesnothd-1.6 -t 2 -T 5
+ExecStart=/usr/bin/wesnothd-1.6
# You can use -c to specify a same configuration file
# (and make sure wesnothd has the required access permissions).
+# Remove remaining administration pipe:
+ExecStopPost=/bin/rm -f /run/wesnothd-1.6/socket
+
SyslogIdentifier=Wesnothd-1.6
+# Apply security settings only to ExecStart, so the Pre & Post steps run as root
+PermissionsStartOnly=yes
+WorkingDirectory=/run/wesnothd-1.6
User=nobody
Group=users
-# Remove remaining administration pipe:
-ExecStopPost=/bin/rm -f /run/wesnothd-1.6/socket
-
# Additional security-related features:
ProtectSystem=strict
ProtectHome=yes