Move settings file, amend sysusers/tmpfiles

6 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bb8150987c7..5057d31d4cd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Apr  8 04:21:41 UTC 2019
+# Mon Apr  8 04:49:14 UTC 2019
 pkgbase = coturn
 	pkgdesc = Open-source implementation of TURN and STUN server
 	pkgver = 4.5.1.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/coturn/coturn
 	install = turnserver.install
 	arch = i686
@@ -16,15 +16,15 @@ pkgbase = coturn
 	depends = hiredis
 	depends = sqlite
 	conflicts = coturn-git
-	backup = etc/turnserver.conf
+	backup = etc/turnserver/turnserver.conf
 	source = https://github.com/coturn/coturn/archive/4.5.1.1.tar.gz
 	source = turnserver.service
 	source = turnserver.sysusers.d
 	source = turnserver.tmpfiles.d
 	sha512sums = a5e1aecdab5a7060ffbc73cc8dd294cafa701f2e0d2a827e40901cb6001af5a2c5ecbafdf14662410713818aad0ad259133f0dc9b34730bf7911863e1e255f70
-	sha512sums = 67d623820c69de86c5831e3daa0172b4ca77278ed138dd55e6775590b89f5293f380adc338a330e26d2eaf0e8dbbc20c0bbf469aca272bae99973386c72aef30
-	sha512sums = 69a8aafaef369ff76043ff9e3b8deef0621ac8db647fa5c044bade30fe6f63b8cc79d2ecedacb83f31e7005cea8ee49dc37b55c2f21eed11c5d1a2b7ca5e68a5
-	sha512sums = d668df15a81a2bb0bb38ebbf367b7ed3db66a17ebadd5fe5bea9b343fbd992d9ada2d146d945f78fc4b2bf103aaa2407a30f270d01919be540b427221de15741
+	sha512sums = 47af7bbf28f8a5fc674b90d1370026405ccb43623f05e47cf915c594e7e35865f4dce64d2b3001bc609a843a54661d1a1172790153f0b8ba9186db48c42b0024
+	sha512sums = 32596f741e561c707f69c1ea90adf75c83742906d33c50e1fa5ec0899eeb607d96a48c36fcbb6facb62947beedcace9f6c3fb748c4d67f058bf3f72413766f82
+	sha512sums = 1d47fd988c36e443aa723d048072eb8be8bb59c2845eb1bbd47eae7d955b6bbda7e5526e00f6ee2f54c5121657413058011aa4c130214a83b9f396a35fb45888
 
 pkgname = coturn
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e788502a5f0..f7ee84786bd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=coturn
 pkgver=4.5.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Open-source implementation of TURN and STUN server'
 arch=(i686 x86_64 armv7h)
 url=https://github.com/coturn/coturn
@@ -13,15 +13,15 @@ license=(BSD)
 depends=(libevent postgresql-libs libmariadbclient hiredis sqlite)
 conflicts=(coturn-git)
 install=turnserver.install
-backup=(etc/turnserver.conf)
+backup=(etc/turnserver/turnserver.conf)
 source=($url/archive/$pkgver.tar.gz
         turnserver.service
         turnserver.sysusers.d
         turnserver.tmpfiles.d)
 sha512sums=('a5e1aecdab5a7060ffbc73cc8dd294cafa701f2e0d2a827e40901cb6001af5a2c5ecbafdf14662410713818aad0ad259133f0dc9b34730bf7911863e1e255f70'
-            '67d623820c69de86c5831e3daa0172b4ca77278ed138dd55e6775590b89f5293f380adc338a330e26d2eaf0e8dbbc20c0bbf469aca272bae99973386c72aef30'
-            '69a8aafaef369ff76043ff9e3b8deef0621ac8db647fa5c044bade30fe6f63b8cc79d2ecedacb83f31e7005cea8ee49dc37b55c2f21eed11c5d1a2b7ca5e68a5'
-            'd668df15a81a2bb0bb38ebbf367b7ed3db66a17ebadd5fe5bea9b343fbd992d9ada2d146d945f78fc4b2bf103aaa2407a30f270d01919be540b427221de15741')
+            '47af7bbf28f8a5fc674b90d1370026405ccb43623f05e47cf915c594e7e35865f4dce64d2b3001bc609a843a54661d1a1172790153f0b8ba9186db48c42b0024'
+            '32596f741e561c707f69c1ea90adf75c83742906d33c50e1fa5ec0899eeb607d96a48c36fcbb6facb62947beedcace9f6c3fb748c4d67f058bf3f72413766f82'
+            '1d47fd988c36e443aa723d048072eb8be8bb59c2845eb1bbd47eae7d955b6bbda7e5526e00f6ee2f54c5121657413058011aa4c130214a83b9f396a35fb45888')
 
 build() {
   cd coturn-$pkgver
@@ -51,14 +51,14 @@ package() {
   cd "$pkgdir"
 
   # Create needed directories
-  mkdir -p {etc,var/log/turnserver}
+  mkdir -p {etc/turnserver,var/log/turnserver}
 
   # Have the config file use more appropriate directories
-  mv {usr/etc/turnserver.conf.default,etc/turnserver.conf}
+  mv {usr/etc/turnserver.conf.default,etc/turnserver/turnserver.conf}
   sed \
     -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \
     -e '/^#pidfile="\/var\/run\/turnserver.pid"$/c pidfile=\/var\/run\/turnserver\/turnserver.pid' \
-    -i etc/turnserver.conf
+    -i etc/turnserver/turnserver.conf
   rmdir usr/etc
 
   # Remove executable bits from files that erroneously have them
diff --git a/turnserver.install b/turnserver.install
index 4dc69b4bd0e6..807fc46cfc58 100644
--- a/turnserver.install
+++ b/turnserver.install
@@ -1,3 +1,3 @@
 post_install() {
-  echo 'Settings are at /etc/turnserver.conf'
+  echo 'Settings are at /etc/turnserver/turnserver.conf'
 }
diff --git a/turnserver.service b/turnserver.service
index 35f38143904c..8321256806ce 100644
--- a/turnserver.service
+++ b/turnserver.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 User=turnserver
 Type=forking
-ExecStart=/usr/bin/turnserver -c /etc/turnserver.conf -o -v
+ExecStart=/usr/bin/turnserver -c /etc/turnserver/turnserver.conf -o -v
 
 [Install]
 WantedBy=multi-user.target
diff --git a/turnserver.sysusers.d b/turnserver.sysusers.d
index 074bf96a5816..8850ff512426 100644
--- a/turnserver.sysusers.d
+++ b/turnserver.sysusers.d
@@ -1 +1 @@
-u turnserver - "TurnServer user"
+u turnserver - "TurnServer user" /etc/turnserver
diff --git a/turnserver.tmpfiles.d b/turnserver.tmpfiles.d
index bf954621f909..5efa02ad29ad 100644
--- a/turnserver.tmpfiles.d
+++ b/turnserver.tmpfiles.d
@@ -1,3 +1,3 @@
-z /etc/turnserver.conf 0600 turnserver turnserver
-
-d /run/turnserver 0755 turnserver turnserver -
+d /etc/turnserver 0700 turnserver turnserver
+Z /etc/turnserver/turnserver.conf 0600 turnserver turnserver
+d /run/turnserver 0700 turnserver turnserver