[arch-commits] Commit in ejabberd/repos (16 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Wed Nov 6 15:25:10 UTC 2013
Date: Wednesday, November 6, 2013 @ 16:25:10
Author: spupykin
Revision: 100626
archrelease: copy trunk to community-x86_64, community-i686
Added:
ejabberd/repos/community-i686/PKGBUILD
(from rev 100625, ejabberd/trunk/PKGBUILD)
ejabberd/repos/community-i686/ejabberd.install
(from rev 100625, ejabberd/trunk/ejabberd.install)
ejabberd/repos/community-i686/ejabberd.logrotate
(from rev 100625, ejabberd/trunk/ejabberd.logrotate)
ejabberd/repos/community-i686/ejabberd.service
(from rev 100625, ejabberd/trunk/ejabberd.service)
ejabberd/repos/community-x86_64/PKGBUILD
(from rev 100625, ejabberd/trunk/PKGBUILD)
ejabberd/repos/community-x86_64/ejabberd.install
(from rev 100625, ejabberd/trunk/ejabberd.install)
ejabberd/repos/community-x86_64/ejabberd.logrotate
(from rev 100625, ejabberd/trunk/ejabberd.logrotate)
ejabberd/repos/community-x86_64/ejabberd.service
(from rev 100625, ejabberd/trunk/ejabberd.service)
Deleted:
ejabberd/repos/community-i686/PKGBUILD
ejabberd/repos/community-i686/ejabberd.install
ejabberd/repos/community-i686/ejabberd.logrotate
ejabberd/repos/community-i686/ejabberd.service
ejabberd/repos/community-x86_64/PKGBUILD
ejabberd/repos/community-x86_64/ejabberd.install
ejabberd/repos/community-x86_64/ejabberd.logrotate
ejabberd/repos/community-x86_64/ejabberd.service
-------------------------------------+
/PKGBUILD | 152 ++++++++++++++++++++++++++++++++++
/ejabberd.install | 42 +++++++++
/ejabberd.logrotate | 24 +++++
/ejabberd.service | 28 ++++++
community-i686/PKGBUILD | 68 ---------------
community-i686/ejabberd.install | 25 -----
community-i686/ejabberd.logrotate | 12 --
community-i686/ejabberd.service | 13 --
community-x86_64/PKGBUILD | 68 ---------------
community-x86_64/ejabberd.install | 25 -----
community-x86_64/ejabberd.logrotate | 12 --
community-x86_64/ejabberd.service | 13 --
12 files changed, 246 insertions(+), 236 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-11-06 15:24:46 UTC (rev 100625)
+++ community-i686/PKGBUILD 2013-11-06 15:25:10 UTC (rev 100626)
@@ -1,68 +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=13.10
-pkgrel=1
-pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
-url="http://www.ejabberd.im/"
-license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
-makedepends=('git') # TODO: build all deps as packages
-backup=('etc/ejabberd/ejabberd.cfg'
- 'etc/ejabberd/ejabberdctl.cfg'
- 'etc/logrotate.d/ejabberd')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
- "git://github.com/processone/cache_tab"
- "git://github.com/processone/tls"
- "git://github.com/processone/stringprep"
- "git://github.com/processone/xml"
- "git://github.com/processone/p1_yaml"
- "git://github.com/rds13/xmlrpc"
- "git://github.com/processone/epam"
- "git://github.com/processone/zlib"
- "git://github.com/basho/lager"
- "git://github.com/processone/eiconv"
- "git://github.com/DeadZen/goldrush.git"
- "$pkgname.logrotate"
- "ejabberd.service")
-md5sums=('70a78db576e36c1e714205c983c8a568'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'f97c8a96160f30e0aecc9526c12e6606'
- 'df32aa17e40a7bc5d9946d3ba6fe5e16')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-pam --enable-odbc
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -d "$pkgdir/var/lib/$pkgname"
- install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
- chmod ug+r "$pkgdir/etc/$pkgname/"*
- mkdir -p $pkgdir/usr/bin
- mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
- chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
- rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
- 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 100625, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-11-06 15:25:10 UTC (rev 100626)
@@ -0,0 +1,76 @@
+# $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=13.10
+pkgrel=2
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
+makedepends=('git')
+backup=('etc/ejabberd/ejabberd.yml'
+ 'etc/ejabberd/ejabberdctl.cfg'
+ 'etc/logrotate.d/ejabberd')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
+ "p1_cache_tab::git://github.com/processone/cache_tab"
+ "p1_tls::git://github.com/processone/tls"
+ "p1_stringprep::git://github.com/processone/stringprep"
+ "p1_xml::git://github.com/processone/xml"
+ "p1_yaml::git://github.com/processone/p1_yaml"
+ "git://github.com/rds13/xmlrpc"
+ "p1_pam::git://github.com/processone/epam"
+ "p1_zlib::git://github.com/processone/zlib"
+ "git://github.com/basho/lager"
+ "p1_iconv::git://github.com/processone/eiconv"
+ "git://github.com/DeadZen/goldrush.git"
+ "$pkgname.logrotate"
+ "ejabberd.service")
+md5sums=('70a78db576e36c1e714205c983c8a568'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'f97c8a96160f30e0aecc9526c12e6606'
+ 'a437aff9d7d477fb036d527205617e18')
+
+prepare() {
+ mkdir -p "$srcdir/$pkgname-$pkgver/deps"
+ for i in goldrush lager p1_cache_tab p1_iconv p1_pam p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc; do
+ rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+ mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+ done
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --enable-pam --enable-odbc
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -d "$pkgdir/var/lib/$pkgname"
+ install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+ chmod ug+r "$pkgdir/etc/$pkgname/"*
+ mkdir -p $pkgdir/usr/bin
+ mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
+ chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
+ rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
+ install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/ejabberd.install
===================================================================
--- community-i686/ejabberd.install 2013-11-06 15:24:46 UTC (rev 100625)
+++ community-i686/ejabberd.install 2013-11-06 15:25:10 UTC (rev 100626)
@@ -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 100625, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-i686/ejabberd.install (rev 0)
+++ community-i686/ejabberd.install 2013-11-06 15:25:10 UTC (rev 100626)
@@ -0,0 +1,21 @@
+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 /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+}
+
+post_upgrade() {
+ chown -R ejabberd.jabber /var/log/ejabberd
+ chown -R ejabberd.jabber /var/lib/ejabberd
+ chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+ echo "!!! it is major update. Config must be converted to yaml format."
+}
+
+post_remove() {
+ userdel ejabberd
+ groupdel jabber
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/ejabberd.logrotate
===================================================================
--- community-i686/ejabberd.logrotate 2013-11-06 15:24:46 UTC (rev 100625)
+++ community-i686/ejabberd.logrotate 2013-11-06 15:25:10 UTC (rev 100626)
@@ -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 100625, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-i686/ejabberd.logrotate (rev 0)
+++ community-i686/ejabberd.logrotate 2013-11-06 15:25:10 UTC (rev 100626)
@@ -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-11-06 15:24:46 UTC (rev 100625)
+++ community-i686/ejabberd.service 2013-11-06 15:25:10 UTC (rev 100626)
@@ -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 100625, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-i686/ejabberd.service (rev 0)
+++ community-i686/ejabberd.service 2013-11-06 15:25:10 UTC (rev 100626)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=forking
+User=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/bin/ejabberdctl start
+ExecStop=/usr/bin/ejabberdctl stop
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-11-06 15:24:46 UTC (rev 100625)
+++ community-x86_64/PKGBUILD 2013-11-06 15:25:10 UTC (rev 100626)
@@ -1,68 +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=13.10
-pkgrel=1
-pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
-url="http://www.ejabberd.im/"
-license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
-makedepends=('git') # TODO: build all deps as packages
-backup=('etc/ejabberd/ejabberd.cfg'
- 'etc/ejabberd/ejabberdctl.cfg'
- 'etc/logrotate.d/ejabberd')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
- "git://github.com/processone/cache_tab"
- "git://github.com/processone/tls"
- "git://github.com/processone/stringprep"
- "git://github.com/processone/xml"
- "git://github.com/processone/p1_yaml"
- "git://github.com/rds13/xmlrpc"
- "git://github.com/processone/epam"
- "git://github.com/processone/zlib"
- "git://github.com/basho/lager"
- "git://github.com/processone/eiconv"
- "git://github.com/DeadZen/goldrush.git"
- "$pkgname.logrotate"
- "ejabberd.service")
-md5sums=('70a78db576e36c1e714205c983c8a568'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'f97c8a96160f30e0aecc9526c12e6606'
- 'df32aa17e40a7bc5d9946d3ba6fe5e16')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-pam --enable-odbc
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -d "$pkgdir/var/lib/$pkgname"
- install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
- chmod ug+r "$pkgdir/etc/$pkgname/"*
- mkdir -p $pkgdir/usr/bin
- mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
- chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
- rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
- 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 100625, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-11-06 15:25:10 UTC (rev 100626)
@@ -0,0 +1,76 @@
+# $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=13.10
+pkgrel=2
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
+makedepends=('git')
+backup=('etc/ejabberd/ejabberd.yml'
+ 'etc/ejabberd/ejabberdctl.cfg'
+ 'etc/logrotate.d/ejabberd')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
+ "p1_cache_tab::git://github.com/processone/cache_tab"
+ "p1_tls::git://github.com/processone/tls"
+ "p1_stringprep::git://github.com/processone/stringprep"
+ "p1_xml::git://github.com/processone/xml"
+ "p1_yaml::git://github.com/processone/p1_yaml"
+ "git://github.com/rds13/xmlrpc"
+ "p1_pam::git://github.com/processone/epam"
+ "p1_zlib::git://github.com/processone/zlib"
+ "git://github.com/basho/lager"
+ "p1_iconv::git://github.com/processone/eiconv"
+ "git://github.com/DeadZen/goldrush.git"
+ "$pkgname.logrotate"
+ "ejabberd.service")
+md5sums=('70a78db576e36c1e714205c983c8a568'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'f97c8a96160f30e0aecc9526c12e6606'
+ 'a437aff9d7d477fb036d527205617e18')
+
+prepare() {
+ mkdir -p "$srcdir/$pkgname-$pkgver/deps"
+ for i in goldrush lager p1_cache_tab p1_iconv p1_pam p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc; do
+ rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+ mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+ done
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --enable-pam --enable-odbc
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -d "$pkgdir/var/lib/$pkgname"
+ install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+ chmod ug+r "$pkgdir/etc/$pkgname/"*
+ mkdir -p $pkgdir/usr/bin
+ mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
+ chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
+ rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
+ install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/ejabberd.install
===================================================================
--- community-x86_64/ejabberd.install 2013-11-06 15:24:46 UTC (rev 100625)
+++ community-x86_64/ejabberd.install 2013-11-06 15:25:10 UTC (rev 100626)
@@ -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 100625, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-x86_64/ejabberd.install (rev 0)
+++ community-x86_64/ejabberd.install 2013-11-06 15:25:10 UTC (rev 100626)
@@ -0,0 +1,21 @@
+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 /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+}
+
+post_upgrade() {
+ chown -R ejabberd.jabber /var/log/ejabberd
+ chown -R ejabberd.jabber /var/lib/ejabberd
+ chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+ echo "!!! it is major update. Config must be converted to yaml format."
+}
+
+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-11-06 15:24:46 UTC (rev 100625)
+++ community-x86_64/ejabberd.logrotate 2013-11-06 15:25:10 UTC (rev 100626)
@@ -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 100625, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-x86_64/ejabberd.logrotate (rev 0)
+++ community-x86_64/ejabberd.logrotate 2013-11-06 15:25:10 UTC (rev 100626)
@@ -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-11-06 15:24:46 UTC (rev 100625)
+++ community-x86_64/ejabberd.service 2013-11-06 15:25:10 UTC (rev 100626)
@@ -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 100625, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-x86_64/ejabberd.service (rev 0)
+++ community-x86_64/ejabberd.service 2013-11-06 15:25:10 UTC (rev 100626)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=forking
+User=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/bin/ejabberdctl start
+ExecStop=/usr/bin/ejabberdctl stop
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list