Version 0.10.r7005.4b024f29e40d

3 files changed, 32 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a5444ee9670..c9fe731267f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Dec 14 11:40:46 UTC 2015
 pkgbase = prosody-hg
 	pkgdesc = Lightweight and extensible Jabber/XMPP server written in Lua
-	pkgver = 0.10.r6947.032313f356c9
+	pkgver = 0.10.r7005.4b024f29e40d
 	pkgrel = 1
 	url = http://prosody.im/
 	install = prosody.install
diff --git a/PKGBUILD b/PKGBUILD
index 0959ff677ce6..c1ea0e3ddce6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=prosody-hg
 pkgrel=1
-pkgver=0.10.r6947.032313f356c9
+pkgver=0.10.r7005.4b024f29e40d
 pkgver() {
   cd "$srcdir/$pkgname"
   printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
diff --git a/prosody.logrotated b/prosody.logrotated
index 13876230fbd4..a49e27138ea7 100644
--- a/prosody.logrotated
+++ b/prosody.logrotated
@@ -1,9 +1,29 @@
-/var/log/prosody/prosody.log /var/log/prosody/prosody.err {
-    # olddir /var/log/old/prosody
-    create 644 prosody prosody
-    sharedscripts
-    missingok
-    postrotate
-        /bin/kill -HUP `cat /run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true
-    endscript
+post_install() {
+    systemd-sysusers prosody.conf
+    systemd-tmpfiles --create prosody.conf
+
+    chown prosody:jabber var/lib/prosody
+    [ -d var/log/prosody ] && chown prosody:jabber var/log/prosody
+
+    echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody"
+}
+
+post_upgrade() {
+    post_install $1
+    echo "Now prosody logs to syslog by default"
+}
+
+post_remove() {
+    paths=(/etc/prosody /var/lib/prosody /var/log/prosody
+           /var/log/old/prosody)
+    first=true
+    for path in ${paths[@]}; do
+        if [ -d $path ]; then
+            if $first; then
+                first=false
+                echo "==> Leftover Paths:"
+            fi
+            echo "==> $path"
+        fi
+    done
 }