Update service files, create a user to run as, chown sensitive/privileged files.

7 files changed, 63 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f800bbc909a3..4ea35ac4fce6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,6 +3,7 @@ pkgbase = openuru-moss
 	pkgver = r41+.3e78d60a5282+
 	pkgrel = 1
 	url = openuru.org
+	install = openuru-moss.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -14,11 +15,15 @@ pkgbase = openuru-moss
 	source = openuru-moss::hg+http://foundry.openuru.org/hg/MOSS
 	source = include_unistd.patch
 	source = moss.service
-	source = moss_backend.service
+	source = moss-backend.service
+	source = backend.cfg.patch
+	source = main.cfg.patch
 	md5sums = SKIP
 	md5sums = 923b06d8c25265679bd35e532118f2ff
-	md5sums = d526247b757050c81679b9a7c5a6fae9
-	md5sums = fceb9167b73375048e95f55458388d47
+	md5sums = b3ad8841685bb3ee6b34cfb3ed0a1c30
+	md5sums = 65834289d108b7f87d1c9e2339be6ca7
+	md5sums = 36d6ab8ca9bfec4d401bae097e0fd9f4
+	md5sums = 112eed405369c984349bf78d47500227
 
 pkgname = openuru-moss
 
diff --git a/PKGBUILD b/PKGBUILD
index c242ef071bb9..a2e1e48362f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,20 @@ depends=('libpqxx'
 makedepends=('mercurial')
 backup=('etc/moss/moss.cfg'
         'etc/moss/moss_backend.cfg')
+install=openuru-moss.install
 source=("$pkgname::hg+http://foundry.openuru.org/hg/MOSS"
         "include_unistd.patch"
         "moss.service"
-        "moss_backend.service")
+        "moss-backend.service"
+        "backend.cfg.patch"
+        "main.cfg.patch")
+
 md5sums=('SKIP'
          '923b06d8c25265679bd35e532118f2ff'
-         'd526247b757050c81679b9a7c5a6fae9'
-         'fceb9167b73375048e95f55458388d47')
+         'b3ad8841685bb3ee6b34cfb3ed0a1c30'
+         '65834289d108b7f87d1c9e2339be6ca7'
+         '36d6ab8ca9bfec4d401bae097e0fd9f4'
+         '112eed405369c984349bf78d47500227')
 
 prepare() {
     cd "$srcdir"
@@ -35,9 +41,14 @@ build() {
 }
 
 package() {
+    mkdir -p $pkgdir/var/log/moss
+
 	cd "$srcdir"
-    install -Dm644 moss.service $pkgdir/usr/lib/systemd/user/moss.service
-    install -Dm644 moss_backend.service $pkgdir/usr/lib/systemd/user/moss_backend.service
+	patch -p0 -i "backend.cfg.patch"
+	patch -p0 -i "main.cfg.patch"
+    install -Dm644 moss.service $pkgdir/usr/lib/systemd/system/moss.service
+    install -Dm644 moss-backend.service $pkgdir/usr/lib/systemd/system/moss-backend.service
+
     cd "$pkgname"
 	make DESTDIR="$pkgdir/" install
     install -Dm644 main.cfg $pkgdir/etc/moss/moss.cfg
diff --git a/backend.cfg.patch b/backend.cfg.patch
new file mode 100644
index 000000000000..c6fbe48ac75b
--- /dev/null
+++ b/backend.cfg.patch
@@ -0,0 +1,11 @@
+--- openuru-moss/backend.cfg	2017-02-15 12:49:39.154087650 -0500
++++ openuru-moss/backend.cfg.foo	2017-03-10 12:54:01.781243858 -0500
+@@ -19,7 +19,7 @@
+ # log level (default is "NET")
+ # log levels: MSGS, DEBUG, NET, WARN, INFO, ERR
+ 
+-#log_dir = log
++log_dir = /var/log/moss
+ #log_level = NET
+ 
+ # the file to put the PID into (default is /var/run/moss_backend.pid)
diff --git a/main.cfg.patch b/main.cfg.patch
new file mode 100644
index 000000000000..692d4a21299c
--- /dev/null
+++ b/main.cfg.patch
@@ -0,0 +1,11 @@
+--- openuru-moss/main.cfg	2017-02-15 12:49:39.157421045 -0500
++++ openuru-moss/main.cfg.foo	2017-03-10 12:55:20.932748550 -0500
+@@ -26,7 +26,7 @@
+ # log level (default is "NET")
+ # log levels: MSGS, DEBUG, NET, WARN, INFO, ERR
+ 
+-#log_dir = log
++log_dir = /var/log/moss
+ #log_level = NET
+ 
+ # the file to put the PID into (default is /var/run/moss.pid)
diff --git a/moss_backend.service b/moss-backend.service
index 646596305d12..f573011b1aa8 100644
--- a/moss_backend.service
+++ b/moss-backend.service
@@ -7,6 +7,8 @@ Before=moss.service
 [Service]
 Type=forking
 ExecStart=/usr/bin/moss_backend -c /etc/moss/moss_backend.cfg
+PIDFile=/var/run/moss_backend.pid
+User=moss
 
 [Install]
 WantedBy=multi-user.target
diff --git a/moss.service b/moss.service
index 62844cada465..c3312e423a03 100644
--- a/moss.service
+++ b/moss.service
@@ -4,6 +4,8 @@ Description=MOSS is a UNIX-based server for the Myst Online: Uru Live client
 [Service]
 Type=forking
 ExecStart=/usr/bin/moss -c /etc/moss/moss.cfg
+PIDFile=/var/run/moss.pid
+User=moss
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openuru-moss.install b/openuru-moss.install
new file mode 100644
index 000000000000..202ec7a74aab
--- /dev/null
+++ b/openuru-moss.install
@@ -0,0 +1,13 @@
+post_install() {
+    useradd --user-group -r moss
+    chown moss:moss var/log/moss
+    chown moss:moss usr/lib/systemd/system/moss.service
+    chown moss:moss usr/lib/systemd/system/moss-backend.service
+    chown moss:moss etc/moss/moss.cfg
+    chown moss:moss etc/moss/moss_backend.cfg
+    systemctl daemon-reload
+}
+
+post_remove() {
+    userdel moss
+}