Date: Wednesday, January 20, 2016 @ 16:03:27 Author: spupykin Revision: 158124
upgpkg: ejabberd 16.01-2 upd Modified: ejabberd/trunk/PKGBUILD ejabberd/trunk/ejabberd.install ejabberd/trunk/ejabberd.service ejabberd/trunk/sysuser.conf ------------------+ PKGBUILD | 18 +++++++++++++----- ejabberd.install | 20 +++++--------------- ejabberd.service | 3 ++- sysuser.conf | 3 +-- 4 files changed, 21 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-01-20 15:02:14 UTC (rev 158123) +++ PKGBUILD 2016-01-20 15:03:27 UTC (rev 158124) @@ -14,7 +14,7 @@ pkgname=ejabberd pkgver=16.01 -pkgrel=1 +pkgrel=2 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686') url="http://www.ejabberd.im/" @@ -26,8 +26,7 @@ 'etc/ejabberd/ejabberdctl.cfg' 'etc/logrotate.d/ejabberd') install=$pkgname.install -replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn' - 'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn') +options=(emptydirs) source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz" "cache_tab::git://github.com/processone/cache_tab#commit=26caea06c72c2117ca54d04beedb5b49a45af1a8" "elixir::git://github.com/elixir-lang/elixir#commit=f2a9c7016633ca63541a8160c63a53eb7edbccdb" @@ -88,8 +87,8 @@ 'SKIP' 'SKIP' 'f97c8a96160f30e0aecc9526c12e6606' - 'a437aff9d7d477fb036d527205617e18' - '458fc41be4adb9554a53b8f9ae05fbee') + '527d7e8616332320007f2c1616bc8270' + 'a3ebb00982d290284c1176c176a59b48') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -130,9 +129,18 @@ rm -rf "$pkgdir/var/lock" install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf + # workaround ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd-$pkgver/ebin/configure.beam rm -f $pkgdir/usr/bin/{elixir,iex,mix} + + # permissions + chown -R 17:17 $pkgdir/var/{lib,log}/ejabberd + chown root:17 \ + $pkgdir/etc/ejabberd/ejabberd.yml \ + $pkgdir/etc/ejabberd/ejabberdctl.cfg \ + $pkgdir/etc/ejabberd \ + $pkgdir/usr/lib/ejabberd-$pkgver/priv/bin/epam } # vim:set ts=2 sw=2 et: Modified: ejabberd.install =================================================================== --- ejabberd.install 2016-01-20 15:02:14 UTC (rev 158123) +++ ejabberd.install 2016-01-20 15:03:27 UTC (rev 158124) @@ -1,21 +1,11 @@ post_install() { systemd-sysusers ejabberd.conf - 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 \ - 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.yml \ - etc/ejabberd/ejabberdctl.cfg \ - etc/ejabberd \ - usr/lib/ejabberd/priv/bin/epam - echo "!!! it is major update. Config must be converted to yaml format." + systemd-sysusers ejabberd.conf + echo "!!! ejabberd user changed to predefined jabber(uid=17)" + echo "!!! check file permission and ownership in" + echo "!!! /etc/ejabberd/" + echo "!!! /var/{lib,log}/ejabberd/" } Modified: ejabberd.service =================================================================== --- ejabberd.service 2016-01-20 15:02:14 UTC (rev 158123) +++ ejabberd.service 2016-01-20 15:03:27 UTC (rev 158124) @@ -4,7 +4,8 @@ [Service] Type=forking -User=ejabberd +User=jabber +Environment=HOME=/var/lib/ejabberd LimitNOFILE=16000 RestartSec=5 ExecStart=/usr/bin/ejabberdctl start Modified: sysuser.conf =================================================================== --- sysuser.conf 2016-01-20 15:02:14 UTC (rev 158123) +++ sysuser.conf 2016-01-20 15:03:27 UTC (rev 158124) @@ -1,3 +1,2 @@ g jabber 17 - - -u ejabberd - - /var/lib/ejabberd -m ejabberd jabber +u jabber 17 - /var/empty