Subject: [alpine-aports] [PATCH] Fixed prosody user creation and changed config to use /var/run/prosody dir for pidfile

From: Nicolas de la Torre <[email-masked]>
Date: Wed, 30 Sep 2015 05:08:50 -0300

From: Nicols de la Torre <[email-masked]>

---
 testing/prosody/APKBUILD              | 8 ++++----
 testing/prosody/prosody.cfg.lua.patch | 2 +-
 testing/prosody/prosody.pre-install   | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/testing/prosody/APKBUILD b/testing/prosody/APKBUILD
index e285ab4..f353cfd 100644
--- a/testing/prosody/APKBUILD
+++ b/testing/prosody/APKBUILD
@@ -3,7 +3,7 @@
 _luaver=5.1
 pkgname=prosody
 pkgver=0.9.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua based Jabber/XMPP server"
 url="http://prosody.im/"
 arch="all"
@@ -54,11 +54,11 @@ package() {
 }
 
 md5sums="5144cd832a1860443e21e336dc560ee7  prosody-0.9.8.tar.gz
-a21d6a6efef8a08ae21109c2aa9c2fc7  prosody.cfg.lua.patch
+b839353efd51b724723f0f4293f76bfb  prosody.cfg.lua.patch
 9b68b81deb2148a3a6c3b5d2eb9c96b9  prosody.initd"
 sha256sums="9470415c56e0b847089b45fabd48bc1f8211cd525fba56967409d064f4257871  prosody-0.9.8.tar.gz
-db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da  prosody.cfg.lua.patch
+8653ccb14a0a5e27fee95b5baf412158543f619f6ca54fd7630c8d333ddddadd  prosody.cfg.lua.patch
 0db9babd65354fe8693d1233945da61ebbea525915f881cf601211110ea50b08  prosody.initd"
 sha512sums="08ca8c8028a947a22d68ddc1d7eb93d3d205894102c900ece9e537ef9dd9332e8509e4b170069383e4f9717b52fd41aec2aa9d959e16ddebf0c3d54fe31aef3c  prosody-0.9.8.tar.gz
-6de138346c10388e986e26b6caae75291c6c19bf168ccb9daef2ac08a9d4cd1d5cfa74438e89316303ba2956a25eec8b3db23ced9fa2763cf9d8387116677001  prosody.cfg.lua.patch
+950d9b53887d859b7d64986ba3817f92fb45ed1b653998759458156197b9623f1cc240559da071e20992f7aa497ef37d422da2168aa5b3c4ea3946482d160f41  prosody.cfg.lua.patch
 95f46dde7e066a93429c46a8ac42698af3754ebe0ed89c7dc86fad042d68264695f4270ecc5a9dabec2b5c2f989928e50b0556ccbcc513ff73ddbb5e01b47dfe  prosody.initd"
diff --git a/testing/prosody/prosody.cfg.lua.patch b/testing/prosody/prosody.cfg.lua.patch
index 9b837c8..444eeb6 100644
--- a/testing/prosody/prosody.cfg.lua.patch
+++ b/testing/prosody/prosody.cfg.lua.patch
@@ -6,7 +6,7 @@ diff -wbBur prosody-0.9.0.q/prosody.cfg.lua.dist prosody-0.9.0/prosody.cfg.lua.d
  -- blanks. Good luck, and happy Jabbering!
  
 +daemonize = true
-+pidfile = "/run/prosody/prosody.pid"
++pidfile = "/var/run/prosody/prosody.pid"
  
  ---------- Server-wide settings ----------
  -- Settings in this section apply to the whole server and are the default settings
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index 957fbd7..2dbe8bf 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -4,5 +4,6 @@ adduser -D \
 	-h /var/lib/prosody \
 	-s /sbin/nologin \
 	-g "Prosody XMPP Server" \
+    -G prosody \
 	prosody 2>/dev/null
 exit 0
-- 
2.6.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---