diff options
| -rw-r--r-- | PKGBUILD | 27 | ||||
| -rw-r--r-- | prosody.install | 1 |
2 files changed, 20 insertions, 8 deletions
@@ -8,7 +8,7 @@ pkgname=prosody-hg-stable pkgrel=1 -pkgver=0.10.r6868.ba83ff7d9bd7 +pkgver=0.10.r6868+.ba83ff7d9bd7+ pkgver() { cd "$srcdir/prosody-hg" printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)" @@ -25,17 +25,32 @@ provides=('prosody') optdepends=('lua51-sec: TLS encryption support' 'lua51-zlib: compression support') install=prosody.install -backup=('etc/logrotate.d/prosody' - 'etc/prosody/prosody.cfg.lua') +backup=('etc/prosody/prosody.cfg.lua') source=("prosody-hg::hg+https://hg.prosody.im/0.10" - 'prosody.logrotated' 'prosody.tmpfile.d' 'sysuser.conf' 'prosody.service') prepare() { cd prosody-hg - #sed -i 's|sock, err = socket.udp();|sock, err = (socket.udp4 or socket.udp)();|g' net/dns.lua + + # disable logging to output and activate syslog + sed -i s/"info = "/"-- info = "/g prosody.cfg.lua.dist + sed -i s/"error = "/"-- error = "/g prosody.cfg.lua.dist + sed -i s/"--\ \"\*syslog\"\;"/"\"*syslog\"\;"/g prosody.cfg.lua.dist + + + # add pidfile and daemonize + # daemonize is important for systemd! + mv prosody.cfg.lua.dist prosody.cfg.lua.old + + echo --Important for systemd >> prosody.cfg.lua.dist + echo -- daemonize is important for systemd. if you set this to false the systemd startup will freeze. >> prosody.cfg.lua.dist + echo daemonize = true >> prosody.cfg.lua.dist + echo 'pidfile = "/run/prosody/prosody.pid"'>> prosody.cfg.lua.dist + echo "" >> prosody.cfg.lua.dist + cat prosody.cfg.lua.old >> prosody.cfg.lua.dist + rm prosody.cfg.lua.old } build() { @@ -53,7 +68,6 @@ package() { make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install -C tools/migration -# install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody install -Dm 0644 $srcdir/prosody.tmpfile.d "${pkgdir}"/usr/lib/tmpfiles.d/prosody.conf install -Dm 0644 $srcdir/prosody.service "${pkgdir}"/usr/lib/systemd/system/prosody.service install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/prosody.conf @@ -68,7 +82,6 @@ package() { # vim: ft=sh syn=sh ts=2 sw=2 md5sums=('SKIP' - '5b44aee99f1fa9e7f055e067688cafbd' 'dc8405a6a235b83dc8a0dcdf7b71cbaa' '385ca73d9f6046f3636266ce9bf38797' 'e74045f27cb60908d535969906781f75') diff --git a/prosody.install b/prosody.install index a49e27138ea7..5b8f88f7c8ef 100644 --- a/prosody.install +++ b/prosody.install @@ -10,7 +10,6 @@ post_install() { post_upgrade() { post_install $1 - echo "Now prosody logs to syslog by default" } post_remove() { |