[arch-commits] Commit in ejabberd/repos (22 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Mon Apr 8 09:22:22 UTC 2013
Date: Monday, April 8, 2013 @ 11:22:21
Author: spupykin
Revision: 87844
archrelease: copy trunk to community-x86_64, community-i686
Added:
ejabberd/repos/community-i686/PKGBUILD
(from rev 87843, ejabberd/trunk/PKGBUILD)
ejabberd/repos/community-i686/ejabberd
(from rev 87843, ejabberd/trunk/ejabberd)
ejabberd/repos/community-i686/ejabberd.install
(from rev 87843, ejabberd/trunk/ejabberd.install)
ejabberd/repos/community-i686/ejabberd.logrotate
(from rev 87843, ejabberd/trunk/ejabberd.logrotate)
ejabberd/repos/community-i686/ejabberd.service
(from rev 87843, ejabberd/trunk/ejabberd.service)
ejabberd/repos/community-x86_64/PKGBUILD
(from rev 87843, ejabberd/trunk/PKGBUILD)
ejabberd/repos/community-x86_64/ejabberd
(from rev 87843, ejabberd/trunk/ejabberd)
ejabberd/repos/community-x86_64/ejabberd.install
(from rev 87843, ejabberd/trunk/ejabberd.install)
ejabberd/repos/community-x86_64/ejabberd.logrotate
(from rev 87843, ejabberd/trunk/ejabberd.logrotate)
ejabberd/repos/community-x86_64/ejabberd.service
(from rev 87843, ejabberd/trunk/ejabberd.service)
Deleted:
ejabberd/repos/community-i686/2.1.12rc.diff.gz
ejabberd/repos/community-i686/PKGBUILD
ejabberd/repos/community-i686/ejabberd
ejabberd/repos/community-i686/ejabberd.install
ejabberd/repos/community-i686/ejabberd.logrotate
ejabberd/repos/community-i686/ejabberd.service
ejabberd/repos/community-x86_64/2.1.12rc.diff.gz
ejabberd/repos/community-x86_64/PKGBUILD
ejabberd/repos/community-x86_64/ejabberd
ejabberd/repos/community-x86_64/ejabberd.install
ejabberd/repos/community-x86_64/ejabberd.logrotate
ejabberd/repos/community-x86_64/ejabberd.service
-------------------------------------+
/PKGBUILD | 92 ++++++++++++++++++++++++
/ejabberd | 126 ++++++++++++++++++++++++++++++++++
/ejabberd.install | 50 +++++++++++++
/ejabberd.logrotate | 24 ++++++
/ejabberd.service | 26 +++++++
community-i686/PKGBUILD | 49 -------------
community-i686/ejabberd | 63 -----------------
community-i686/ejabberd.install | 25 ------
community-i686/ejabberd.logrotate | 12 ---
community-i686/ejabberd.service | 13 ---
community-x86_64/PKGBUILD | 49 -------------
community-x86_64/ejabberd | 63 -----------------
community-x86_64/ejabberd.install | 25 ------
community-x86_64/ejabberd.logrotate | 12 ---
community-x86_64/ejabberd.service | 13 ---
15 files changed, 318 insertions(+), 324 deletions(-)
Deleted: community-i686/2.1.12rc.diff.gz
===================================================================
(Binary files differ)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-i686/PKGBUILD 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-
-pkgname=ejabberd
-pkgver=2.1.11
-pkgrel=9
-pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
-url="http://www.ejabberd.im/"
-license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2')
-backup=('etc/ejabberd/ejabberd.cfg'
- 'etc/ejabberd/ejabberdctl.cfg'
- 'etc/logrotate.d/ejabberd')
-install=$pkgname.install
-source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz"
- "$pkgname.logrotate"
- "$pkgname"
- "ejabberd.service"
- "2.1.12rc.diff.gz")
-md5sums=('a70b040c4e7602f47718c8afe8780d50'
- 'f97c8a96160f30e0aecc9526c12e6606'
- '2338a6230ce5f9f60be6dddcfa39bc7e'
- 'df32aa17e40a7bc5d9946d3ba6fe5e16'
- '688e99cdc1fc3a12501caabaec2293a4')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver/src"
- patch -p2 <$srcdir/2.1.12rc.diff
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-pam --enable-odbc
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver/src"
- make DESTDIR="$pkgdir" install
- install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
- install -d "$pkgdir/var/lib/$pkgname"
- install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
- chmod ug+r "$pkgdir/etc/$pkgname/"*
- chmod a+rx "$pkgdir/usr/sbin/ejabberdctl"
- rm -rf "$pkgdir/var/lock"
- install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ejabberd/repos/community-i686/PKGBUILD (from rev 87843, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+pkgname=ejabberd
+pkgver=2.1.12
+pkgrel=1
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2')
+backup=('etc/ejabberd/ejabberd.cfg'
+ 'etc/ejabberd/ejabberdctl.cfg'
+ 'etc/logrotate.d/ejabberd')
+install=$pkgname.install
+source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz"
+ "$pkgname.logrotate"
+ "$pkgname"
+ "ejabberd.service")
+md5sums=('7d49242cf04282f3c4cebfafa2cc2f46'
+ 'f97c8a96160f30e0aecc9526c12e6606'
+ '2338a6230ce5f9f60be6dddcfa39bc7e'
+ 'df32aa17e40a7bc5d9946d3ba6fe5e16')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver/src"
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --enable-pam --enable-odbc
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/src"
+ make DESTDIR="$pkgdir" install
+ install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+ install -d "$pkgdir/var/lib/$pkgname"
+ install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+ chmod ug+r "$pkgdir/etc/$pkgname/"*
+ chmod a+rx "$pkgdir/usr/sbin/ejabberdctl"
+ rm -rf "$pkgdir/var/lock"
+ install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/ejabberd
===================================================================
--- community-i686/ejabberd 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-i686/ejabberd 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-cd /var/log/ejabberd/
-
-get_pid() {
- pidof epmd >/dev/null || { echo '' ; return 0; }
- # get port from 'epmd -names', then get pid from 'ss -tlnp'
- PORT=`epmd -names | grep ejabberd | cut -f5 -d\ `
- [ -z "$PORT" ] && { echo '' ; return 0; }
- PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1`
- [ -z "$PID" ] && { echo '' ; return 0; }
- echo ${PID%/}
-}
-
-case "$1" in
- start)
- stat_busy "Starting ejabber daemon"
-
- [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl
- [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid
- PID=`get_pid`
- if [ -z "$PID" ]; then
- su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"'
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- echo `get_pid` > /var/run/ejabberd.pid
- add_daemon ejabberd
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping ejabber daemon"
- PID=`get_pid`
- [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/ejabberd.pid &> /dev/null
- rm_daemon ejabberd
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: ejabberd/repos/community-i686/ejabberd (from rev 87843, ejabberd/trunk/ejabberd)
===================================================================
--- community-i686/ejabberd (rev 0)
+++ community-i686/ejabberd 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+cd /var/log/ejabberd/
+
+get_pid() {
+ pidof epmd >/dev/null || { echo '' ; return 0; }
+ # get port from 'epmd -names', then get pid from 'ss -tlnp'
+ PORT=`epmd -names | grep ejabberd | cut -f5 -d\ `
+ [ -z "$PORT" ] && { echo '' ; return 0; }
+ PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1`
+ [ -z "$PID" ] && { echo '' ; return 0; }
+ echo ${PID%/}
+}
+
+case "$1" in
+ start)
+ stat_busy "Starting ejabber daemon"
+
+ [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl
+ [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid
+ PID=`get_pid`
+ if [ -z "$PID" ]; then
+ su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"'
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ echo `get_pid` > /var/run/ejabberd.pid
+ add_daemon ejabberd
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping ejabber daemon"
+ PID=`get_pid`
+ [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ rm -f /var/run/ejabberd.pid &> /dev/null
+ rm_daemon ejabberd
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: community-i686/ejabberd.install
===================================================================
--- community-i686/ejabberd.install 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-i686/ejabberd.install 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,25 +0,0 @@
-post_install() {
- groupadd -r jabber
- useradd -r -G jabber -d /var/lib/ejabberd ejabberd
- chown -R ejabberd.jabber /var/log/ejabberd
- chown -R ejabberd.jabber /var/lib/ejabberd
- chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
- chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
- chmod 4750 /usr/lib/ejabberd/priv/bin/epam
-}
-
-post_upgrade() {
- chown -R ejabberd.jabber /var/log/ejabberd
- chown -R ejabberd.jabber /var/lib/ejabberd
- chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
- chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
- chmod 4750 /usr/lib/ejabberd/priv/bin/epam
- echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now"
-}
-
-post_remove() {
- userdel ejabberd
- groupdel jabber
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ejabberd/repos/community-i686/ejabberd.install (from rev 87843, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-i686/ejabberd.install (rev 0)
+++ community-i686/ejabberd.install 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,25 @@
+post_install() {
+ groupadd -r jabber
+ useradd -r -G jabber -d /var/lib/ejabberd ejabberd
+ chown -R ejabberd.jabber /var/log/ejabberd
+ chown -R ejabberd.jabber /var/lib/ejabberd
+ chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
+ chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+ chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+}
+
+post_upgrade() {
+ chown -R ejabberd.jabber /var/log/ejabberd
+ chown -R ejabberd.jabber /var/lib/ejabberd
+ chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+ chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
+ chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+ echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now"
+}
+
+post_remove() {
+ userdel ejabberd
+ groupdel jabber
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/ejabberd.logrotate
===================================================================
--- community-i686/ejabberd.logrotate 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-i686/ejabberd.logrotate 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,12 +0,0 @@
-/var/log/ejabberd/ejabberd.log {
- weekly
- missingok
- rotate 10
- compress
- delaycompress
- ifempty
- nomail
- sharedscripts
- postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
- endscript
-}
Copied: ejabberd/repos/community-i686/ejabberd.logrotate (from rev 87843, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-i686/ejabberd.logrotate (rev 0)
+++ community-i686/ejabberd.logrotate 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,12 @@
+/var/log/ejabberd/ejabberd.log {
+ weekly
+ missingok
+ rotate 10
+ compress
+ delaycompress
+ ifempty
+ nomail
+ sharedscripts
+ postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
+ endscript
+}
Deleted: community-i686/ejabberd.service
===================================================================
--- community-i686/ejabberd.service 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-i686/ejabberd.service 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,13 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=forking
-User=ejabberd
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"
-
-[Install]
-WantedBy=multi-user.target
Copied: ejabberd/repos/community-i686/ejabberd.service (from rev 87843, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-i686/ejabberd.service (rev 0)
+++ community-i686/ejabberd.service 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,13 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=forking
+User=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/2.1.12rc.diff.gz
===================================================================
(Binary files differ)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-x86_64/PKGBUILD 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-
-pkgname=ejabberd
-pkgver=2.1.11
-pkgrel=9
-pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
-url="http://www.ejabberd.im/"
-license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2')
-backup=('etc/ejabberd/ejabberd.cfg'
- 'etc/ejabberd/ejabberdctl.cfg'
- 'etc/logrotate.d/ejabberd')
-install=$pkgname.install
-source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz"
- "$pkgname.logrotate"
- "$pkgname"
- "ejabberd.service"
- "2.1.12rc.diff.gz")
-md5sums=('a70b040c4e7602f47718c8afe8780d50'
- 'f97c8a96160f30e0aecc9526c12e6606'
- '2338a6230ce5f9f60be6dddcfa39bc7e'
- 'df32aa17e40a7bc5d9946d3ba6fe5e16'
- '688e99cdc1fc3a12501caabaec2293a4')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver/src"
- patch -p2 <$srcdir/2.1.12rc.diff
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-pam --enable-odbc
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver/src"
- make DESTDIR="$pkgdir" install
- install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
- install -d "$pkgdir/var/lib/$pkgname"
- install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
- chmod ug+r "$pkgdir/etc/$pkgname/"*
- chmod a+rx "$pkgdir/usr/sbin/ejabberdctl"
- rm -rf "$pkgdir/var/lock"
- install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ejabberd/repos/community-x86_64/PKGBUILD (from rev 87843, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+pkgname=ejabberd
+pkgver=2.1.12
+pkgrel=1
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2')
+backup=('etc/ejabberd/ejabberd.cfg'
+ 'etc/ejabberd/ejabberdctl.cfg'
+ 'etc/logrotate.d/ejabberd')
+install=$pkgname.install
+source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz"
+ "$pkgname.logrotate"
+ "$pkgname"
+ "ejabberd.service")
+md5sums=('7d49242cf04282f3c4cebfafa2cc2f46'
+ 'f97c8a96160f30e0aecc9526c12e6606'
+ '2338a6230ce5f9f60be6dddcfa39bc7e'
+ 'df32aa17e40a7bc5d9946d3ba6fe5e16')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver/src"
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --enable-pam --enable-odbc
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/src"
+ make DESTDIR="$pkgdir" install
+ install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+ install -d "$pkgdir/var/lib/$pkgname"
+ install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+ chmod ug+r "$pkgdir/etc/$pkgname/"*
+ chmod a+rx "$pkgdir/usr/sbin/ejabberdctl"
+ rm -rf "$pkgdir/var/lock"
+ install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/ejabberd
===================================================================
--- community-x86_64/ejabberd 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-x86_64/ejabberd 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-cd /var/log/ejabberd/
-
-get_pid() {
- pidof epmd >/dev/null || { echo '' ; return 0; }
- # get port from 'epmd -names', then get pid from 'ss -tlnp'
- PORT=`epmd -names | grep ejabberd | cut -f5 -d\ `
- [ -z "$PORT" ] && { echo '' ; return 0; }
- PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1`
- [ -z "$PID" ] && { echo '' ; return 0; }
- echo ${PID%/}
-}
-
-case "$1" in
- start)
- stat_busy "Starting ejabber daemon"
-
- [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl
- [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid
- PID=`get_pid`
- if [ -z "$PID" ]; then
- su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"'
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- echo `get_pid` > /var/run/ejabberd.pid
- add_daemon ejabberd
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping ejabber daemon"
- PID=`get_pid`
- [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/ejabberd.pid &> /dev/null
- rm_daemon ejabberd
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: ejabberd/repos/community-x86_64/ejabberd (from rev 87843, ejabberd/trunk/ejabberd)
===================================================================
--- community-x86_64/ejabberd (rev 0)
+++ community-x86_64/ejabberd 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+cd /var/log/ejabberd/
+
+get_pid() {
+ pidof epmd >/dev/null || { echo '' ; return 0; }
+ # get port from 'epmd -names', then get pid from 'ss -tlnp'
+ PORT=`epmd -names | grep ejabberd | cut -f5 -d\ `
+ [ -z "$PORT" ] && { echo '' ; return 0; }
+ PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1`
+ [ -z "$PID" ] && { echo '' ; return 0; }
+ echo ${PID%/}
+}
+
+case "$1" in
+ start)
+ stat_busy "Starting ejabber daemon"
+
+ [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl
+ [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid
+ PID=`get_pid`
+ if [ -z "$PID" ]; then
+ su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"'
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ echo `get_pid` > /var/run/ejabberd.pid
+ add_daemon ejabberd
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping ejabber daemon"
+ PID=`get_pid`
+ [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ rm -f /var/run/ejabberd.pid &> /dev/null
+ rm_daemon ejabberd
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: community-x86_64/ejabberd.install
===================================================================
--- community-x86_64/ejabberd.install 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-x86_64/ejabberd.install 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,25 +0,0 @@
-post_install() {
- groupadd -r jabber
- useradd -r -G jabber -d /var/lib/ejabberd ejabberd
- chown -R ejabberd.jabber /var/log/ejabberd
- chown -R ejabberd.jabber /var/lib/ejabberd
- chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
- chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
- chmod 4750 /usr/lib/ejabberd/priv/bin/epam
-}
-
-post_upgrade() {
- chown -R ejabberd.jabber /var/log/ejabberd
- chown -R ejabberd.jabber /var/lib/ejabberd
- chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
- chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
- chmod 4750 /usr/lib/ejabberd/priv/bin/epam
- echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now"
-}
-
-post_remove() {
- userdel ejabberd
- groupdel jabber
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ejabberd/repos/community-x86_64/ejabberd.install (from rev 87843, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-x86_64/ejabberd.install (rev 0)
+++ community-x86_64/ejabberd.install 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,25 @@
+post_install() {
+ groupadd -r jabber
+ useradd -r -G jabber -d /var/lib/ejabberd ejabberd
+ chown -R ejabberd.jabber /var/log/ejabberd
+ chown -R ejabberd.jabber /var/lib/ejabberd
+ chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
+ chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+ chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+}
+
+post_upgrade() {
+ chown -R ejabberd.jabber /var/log/ejabberd
+ chown -R ejabberd.jabber /var/lib/ejabberd
+ chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+ chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
+ chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+ echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now"
+}
+
+post_remove() {
+ userdel ejabberd
+ groupdel jabber
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/ejabberd.logrotate
===================================================================
--- community-x86_64/ejabberd.logrotate 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-x86_64/ejabberd.logrotate 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,12 +0,0 @@
-/var/log/ejabberd/ejabberd.log {
- weekly
- missingok
- rotate 10
- compress
- delaycompress
- ifempty
- nomail
- sharedscripts
- postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
- endscript
-}
Copied: ejabberd/repos/community-x86_64/ejabberd.logrotate (from rev 87843, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-x86_64/ejabberd.logrotate (rev 0)
+++ community-x86_64/ejabberd.logrotate 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,12 @@
+/var/log/ejabberd/ejabberd.log {
+ weekly
+ missingok
+ rotate 10
+ compress
+ delaycompress
+ ifempty
+ nomail
+ sharedscripts
+ postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
+ endscript
+}
Deleted: community-x86_64/ejabberd.service
===================================================================
--- community-x86_64/ejabberd.service 2013-04-08 09:21:49 UTC (rev 87843)
+++ community-x86_64/ejabberd.service 2013-04-08 09:22:21 UTC (rev 87844)
@@ -1,13 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=forking
-User=ejabberd
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"
-
-[Install]
-WantedBy=multi-user.target
Copied: ejabberd/repos/community-x86_64/ejabberd.service (from rev 87843, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-x86_64/ejabberd.service (rev 0)
+++ community-x86_64/ejabberd.service 2013-04-08 09:22:21 UTC (rev 87844)
@@ -0,0 +1,13 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=forking
+User=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list