From 2a0d8cce80c70f98b8f3150dc28f490ad18f7ad1 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Mon, 20 Dec 2010 13:52:23 +0000 Subject: Version bump, thank krigstask for report. Note, shared roster ldap module (USE=mod_srl) is now included upstream. Drop unused. Package-Manager: portage-2.1.9.25/cvs/Linux x86_64 --- net-im/ejabberd/ChangeLog | 9 +- net-im/ejabberd/Manifest | 5 +- net-im/ejabberd/ejabberd-2.1.5-r2.ebuild | 219 ------------------------------- net-im/ejabberd/ejabberd-2.1.6.ebuild | 212 ++++++++++++++++++++++++++++++ 4 files changed, 223 insertions(+), 222 deletions(-) delete mode 100644 net-im/ejabberd/ejabberd-2.1.5-r2.ebuild create mode 100644 net-im/ejabberd/ejabberd-2.1.6.ebuild diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index ed8888350bef..b3c7e739dea9 100644 --- a/net-im/ejabberd/ChangeLog +++ b/net-im/ejabberd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/ejabberd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.88 2010/11/18 13:26:40 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.89 2010/12/20 13:52:23 pva Exp $ + +*ejabberd-2.1.6 (20 Dec 2010) + + 20 Dec 2010; Peter Volkov -ejabberd-2.1.5-r2.ebuild, + +ejabberd-2.1.6.ebuild: + Version bump, thank krigstask for report. Note, shared roster ldap module + (USE=mod_srl) is now included upstream. Drop unused. *ejabberd-2.1.5-r3 (18 Nov 2010) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index b6b278aa45b9..8c6493a6ac66 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -11,10 +11,11 @@ AUX self-cert-v2.sh 1017 RMD160 3beb0f05e8cc3041abd2f689d31d410bc7d5088d SHA1 1f AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635 DIST 2.1.1-mod_statsdx.patch.bz2 13041 RMD160 9cc6d71ff2a2d58b0e377a3facb564d22d46af25 SHA1 4ef326eff97283530ee137613c009fe132312644 SHA256 a290217d7fd2c338d9ddba73e25ee052a3735d7168aafd24750de113f43ebc5f DIST ejabberd-2.1.5.tar.gz 2278008 RMD160 7abd6bc4a03f68d03e13ee8c1ff3a5fee6098dc6 SHA1 8966d6752219c9386f48a5b8e1f2f8fb0e7477ae SHA256 31a46228c6933d7c24435753300a4d2ae2e84568a6097175dc5d4e553299dd9d +DIST ejabberd-2.1.6.tar.gz 2874967 RMD160 9b6ed4986ffcd1ea90d23770e54cb002bc52304c SHA1 a1afbfc270f8e4c945bd91f64b7073781590535b SHA256 b54886b119a0ae9f19c8dd91a18e85e518fbd979d47812bee582e872cfbc3544 DIST mod_shared_roster_ldap-0.5.1.tgz 607758 RMD160 5669a3d16fbca4d399e85a7d0dfda71643e6e2c7 SHA1 a9498d26e17752b882b3341b633d1804075d74ef SHA256 60e4ba0921d1ac65f9cca04fa2a7a3bbe3a9af52a26ad1a4fca4a3c6f1f0cc19 DIST mod_shared_roster_ldap-0.5.3.tgz 663731 RMD160 c8905ccffe4bd99f77fe91d583502d0912b9a005 SHA1 5bb1991868341c7cfc995348747c43833820af2b SHA256 9e295065b60e5e37e839f7793503e9ae5e367c0a749e870cbbeeef3ce5609954 -EBUILD ejabberd-2.1.5-r2.ebuild 8304 RMD160 f7cc7d92284137062a7c723fd1b20866c0ec6fb7 SHA1 05025f9f61f58715b39f54e3864bdb144d74f5ee SHA256 97e3c2e59467b7855d89dbbab4234f2b967ce8a12b213332834a764d7e254a5a EBUILD ejabberd-2.1.5-r3.ebuild 8385 RMD160 8a69ad070aa0fe0f8fd39ad407a2547f6431af04 SHA1 65caac092cd1d3b2e9077729d79860a4c6d9d94a SHA256 896175067d95c70e5ca4b123ba836bfd0611d28b415a6ca4eecb956364c4f824 EBUILD ejabberd-2.1.5.ebuild 8374 RMD160 ec4746817be901804b5603cb388ef7ce9cc706ed SHA1 f735ea63d287b35306878db8092b5d2c6aa2349f SHA256 f0a2fd0e5da4306a8be7f8254f5d77dfadc872cb818d8c0202366fbd16ce188f -MISC ChangeLog 18426 RMD160 fdb8f9a52e3b8ffae315998fd2a0d37ba0650518 SHA1 1ada99f26494a11074761e8710b050c6b45c38e8 SHA256 70ab25e64af1fa7a8286195895a930936d820742a5625219c124523f7b82f7af +EBUILD ejabberd-2.1.6.ebuild 7959 RMD160 60ee8c906ff0d76385132fe05beb93e6ad05a470 SHA1 db9c8b98f22ac6f13c079c36dab8b7058f8a88f3 SHA256 860d83e4274d42d8d2e5a7ce41f5adc7a43211e12fee0ab48d31a7ac791b9fca +MISC ChangeLog 18687 RMD160 ac931202c6e6ec900b1d29a0acf2b54486e0c8e7 SHA1 4233f5fab9b3dcd03e059859f9d490512b88732d SHA256 d95c735d225f2fd664f3d3fb3b3a3ddcd637be3bb298971d3db66803b8fca3a0 MISC metadata.xml 929 RMD160 3a456c8945da34e417ca2fb659807a280b834f85 SHA1 a7b3173f8b63655c049881629e1354c71ddd633e SHA256 4d46909fd72908dff8698bb9dfcf60132e973b28eabbfe75001397ed349ff11b diff --git a/net-im/ejabberd/ejabberd-2.1.5-r2.ebuild b/net-im/ejabberd/ejabberd-2.1.5-r2.ebuild deleted file mode 100644 index 1ca982cc25af..000000000000 --- a/net-im/ejabberd/ejabberd-2.1.5-r2.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.5-r2.ebuild,v 1.1 2010/10/15 17:34:36 pva Exp $ - -EAPI=3 - -inherit eutils multilib pam ssl-cert - -DESCRIPTION="The Erlang Jabber Daemon" -HOMEPAGE="http://www.ejabberd.im/" -SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz - mod_statsdx? ( mirror://gentoo/2.1.1-mod_statsdx.patch.bz2 ) - mod_srl? ( https://alioth.debian.org/frs/download.php/3354/mod_shared_roster_ldap-0.5.3.tgz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" -EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_srl mod_statsdx" -IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}" - -DEPEND=">=net-im/jabber-base-0.01 - >=dev-libs/expat-1.95 - >=dev-lang/erlang-12.2.5[ssl] - odbc? ( dev-db/unixODBC ) - ldap? ( =net-nds/openldap-2* ) - >=dev-libs/openssl-0.9.8e - captcha? ( media-gfx/imagemagick[truetype,png] ) - zlib? ( sys-libs/zlib )" -#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable. -RDEPEND="${DEPEND} - >=sys-apps/shadow-4.1.4.2-r3" - -PROVIDE="virtual/jabber-server" - -S=${WORKDIR}/${P}/src - -# paths in net-im/jabber-base -JABBER_ETC="${EPREFIX}/etc/jabber" -#JABBER_RUN="/var/run/jabber" -JABBER_SPOOL="${EPREFIX}/var/spool/jabber" -JABBER_LOG="${EPREFIX}/var/log/jabber" -JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}" - -src_prepare() { - epatch "${FILESDIR}/${P}-md2-optional.patch" #331299 - if use mod_statsdx; then - ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module" - ewarn "taken from here: http://www.ejabberd.im/mod_stats2file" - epatch "${WORKDIR}/2.1.1-mod_statsdx.patch" - fi - - if use mod_srl; then - ewarn "mod_srl is not a part of upstream tarball but is a third-party module" - ewarn "taken from here: https://alioth.debian.org/projects/ejabberd-msrl/" - cp "${WORKDIR}"/src/mod_shared_roster_ldap{.{e,h}rl,_helpers.erl} "${S}" || die - fi - - # don't install release notes (we'll do this manually) - sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die - # Set correct paths - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \ - -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ - -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ - -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \ - -i Makefile.in || die - sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \ - -e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \ - -e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \ - -e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \ - -i ejabberdctl.template || die - - # Set shell, so it'll work even in case jabber user have no shell - # This is gentoo specific I guess since other distributions may have - # ejabberd user with reall shell, while we share this user among different - # jabberd implementations. - sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die - sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die - - #sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl - - # fix up the ssl cert paths in ejabberd.cfg to use our cert - sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \ - -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example" - - # correct path to captcha script in default ejabberd.cfg - sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \ - -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example" - - # disable mod_irc in ejabberd.cfg - if ! use mod_irc; then - sed -i -e "s/{mod_irc,/%{mod_irc,/" \ - -i ejabberd.cfg.example || die "Failed to disable mod_irc" - fi - -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \ - $(use_enable mod_irc) \ - $(use_enable ldap eldap) \ - $(use_enable mod_muc) \ - $(use_enable mod_proxy65) \ - $(use_enable mod_pubsub) \ - $(use_enable web) \ - $(use_enable odbc) \ - $(use_enable zlib ejabberd_zlib) \ - $(use_enable pam) \ - --enable-user=jabber -} - -src_compile() { - emake $(use debug && echo debug=true ejabberd_debug=true) || die "compiling ejabberd core failed" -} - -src_install() { - emake DESTDIR="${ED}" install || die "install failed" - - # Pam helper module permissions - # http://www.process-one.net/docs/ejabberd/guide_en.html - if use pam; then - pamd_mimic_system xmpp auth account || die "Cannot create pam.d file" - fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die "Cannot adjust epam permissions" - fi - - cd "${WORKDIR}/${P}/doc" - dodoc "release_notes_${PV%%_rc*}.txt" || die - - #dodir /var/lib/ejabberd - newinitd "${FILESDIR}/${PN}-3.initd" ${PN} || die "Cannot install init.d script" - newconfd "${FILESDIR}/${PN}-3.confd" ${PN} || die "Cannot install conf.d file" -} - -pkg_postinst() { - elog "For configuration instructions, please see" - elog "/usr/share/doc/${PF}/html/guide.html, or the online version at" - elog "http://www.process-one.net/en/ejabberd/docs/guide_en/" - - if ! use web ; then - ewarn - ewarn "The web USE flag is off, this has disabled the web admin interface." - ewarn - fi - - elog - elog '====================================================================' - elog 'Quick Start Guide:' - elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91' - elog ' {hosts, ["localhost", "thehost"]}.' - elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360' - elog ' {acl, admin, {user, "theadmin", "thehost"}}.' - elog '3) Start the server' - elog ' # /etc/init.d/ejabberd start' - elog '4) Register the admin user' - elog ' # /usr/sbin/ejabberdctl register theadmin thehost thepassword' - elog '5) Log in with your favourite jabber client or using the web admin' - - # Upgrading from ejabberd-2.0.x: - if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then - source "${EROOT}/etc/conf.d/ejabberd" - ewarn - ewarn "!!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!" - ewarn "Starting with 2.1.x some paths and configuration files were" - ewarn "changed to reflect upstream intentions better. Notable changes are:" - ewarn - ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script." - ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg" - ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE" - ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start." - ewarn - ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides" - ewarn "at standard location: /etc/ssl/ejabberd/server.pem." - ewarn - ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie" - ewarn - ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log" - ewarn - ewarn "5. Crash dumps (if any) will be located at /var/log/jabber" - - local i ctlcfg new_ctlcfg - i=0 - ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg - while :; do - new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i}) - [[ ! -e ${new_ctlcfg} ]] && break - ctlcfg=${new_ctlcfg} - ((i++)) - done - - ewarn - ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})" - sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die - - if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then - ewarn "Moving .erlang.cookie..." - if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then - mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak} - fi - mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie - fi - ewarn - ewarn "We'll try to handle upgrade automagically but, please, do your" - ewarn "own checks and do not forget to run 'etc-update'!" - ewarn "PLEASE! Run 'etc-update' now!" - fi - - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}" - install_cert /etc/ssl/ejabberd/server - if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then - ewarn - ewarn "The location of SSL certificates has changed. If you are" - ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier you might" - ewarn "want to move your old certificates from /etc/jabber into" - ewarn "/etc/ssl/ejabberd/, update config files and" - ewarn "rm /etc/jabber/ssl.pem to avoid this message." - ewarn - fi -} diff --git a/net-im/ejabberd/ejabberd-2.1.6.ebuild b/net-im/ejabberd/ejabberd-2.1.6.ebuild new file mode 100644 index 000000000000..d8877bcb240e --- /dev/null +++ b/net-im/ejabberd/ejabberd-2.1.6.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.6.ebuild,v 1.1 2010/12/20 13:52:23 pva Exp $ + +EAPI=3 + +inherit eutils multilib pam ssl-cert + +DESCRIPTION="The Erlang Jabber Daemon" +HOMEPAGE="http://www.ejabberd.im/" +SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz + mod_statsdx? ( mirror://gentoo/2.1.1-mod_statsdx.patch.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx" +IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}" + +DEPEND=">=net-im/jabber-base-0.01 + >=dev-libs/expat-1.95 + >=dev-lang/erlang-12.2.5[ssl] + odbc? ( dev-db/unixODBC ) + ldap? ( =net-nds/openldap-2* ) + >=dev-libs/openssl-0.9.8e + captcha? ( media-gfx/imagemagick[truetype,png] ) + zlib? ( sys-libs/zlib )" +#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable. +RDEPEND="${DEPEND} + >=sys-apps/shadow-4.1.4.2-r3" + +PROVIDE="virtual/jabber-server" + +S=${WORKDIR}/${P}/src + +# paths in net-im/jabber-base +JABBER_ETC="${EPREFIX}/etc/jabber" +#JABBER_RUN="/var/run/jabber" +JABBER_SPOOL="${EPREFIX}/var/spool/jabber" +JABBER_LOG="${EPREFIX}/var/log/jabber" +JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}" + +src_prepare() { + if use mod_statsdx; then + ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module" + ewarn "taken from here: http://www.ejabberd.im/mod_stats2file" + epatch "${WORKDIR}/2.1.1-mod_statsdx.patch" + fi + + # don't install release notes (we'll do this manually) + sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die + # Set correct paths + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \ + -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ + -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ + -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \ + -i Makefile.in || die + sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \ + -e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \ + -e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \ + -e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \ + -i ejabberdctl.template || die + + # Set shell, so it'll work even in case jabber user have no shell + # This is gentoo specific I guess since other distributions may have + # ejabberd user with reall shell, while we share this user among different + # jabberd implementations. + sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die + sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die + + #sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl + + # fix up the ssl cert paths in ejabberd.cfg to use our cert + sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \ + -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example" + + # correct path to captcha script in default ejabberd.cfg + sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \ + -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example" + + # disable mod_irc in ejabberd.cfg + if ! use mod_irc; then + sed -i -e "s/{mod_irc,/%{mod_irc,/" \ + -i ejabberd.cfg.example || die "Failed to disable mod_irc" + fi + +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \ + $(use_enable mod_irc) \ + $(use_enable ldap eldap) \ + $(use_enable mod_muc) \ + $(use_enable mod_proxy65) \ + $(use_enable mod_pubsub) \ + $(use_enable web) \ + $(use_enable odbc) \ + $(use_enable zlib ejabberd_zlib) \ + $(use_enable pam) \ + --enable-user=jabber +} + +src_compile() { + emake $(use debug && echo debug=true ejabberd_debug=true) || die "compiling ejabberd core failed" +} + +src_install() { + emake DESTDIR="${ED}" install || die "install failed" + + # Pam helper module permissions + # http://www.process-one.net/docs/ejabberd/guide_en.html + if use pam; then + pamd_mimic_system xmpp auth account || die "Cannot create pam.d file" + fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die + fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die "Cannot adjust epam permissions" + fi + + cd "${WORKDIR}/${P}/doc" + dodoc "release_notes_${PV%%_rc*}.txt" || die + + #dodir /var/lib/ejabberd + newinitd "${FILESDIR}/${PN}-3.initd" ${PN} || die "Cannot install init.d script" + newconfd "${FILESDIR}/${PN}-3.confd" ${PN} || die "Cannot install conf.d file" +} + +pkg_postinst() { + elog "For configuration instructions, please see" + elog "/usr/share/doc/${PF}/html/guide.html, or the online version at" + elog "http://www.process-one.net/en/ejabberd/docs/guide_en/" + + if ! use web ; then + ewarn + ewarn "The web USE flag is off, this has disabled the web admin interface." + ewarn + fi + + elog + elog '====================================================================' + elog 'Quick Start Guide:' + elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91' + elog ' {hosts, ["localhost", "thehost"]}.' + elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360' + elog ' {acl, admin, {user, "theadmin", "thehost"}}.' + elog '3) Start the server' + elog ' # /etc/init.d/ejabberd start' + elog '4) Register the admin user' + elog ' # /usr/sbin/ejabberdctl register theadmin thehost thepassword' + elog '5) Log in with your favourite jabber client or using the web admin' + + # Upgrading from ejabberd-2.0.x: + if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then + source "${EROOT}/etc/conf.d/ejabberd" + ewarn + ewarn "!!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!" + ewarn "Starting with 2.1.x some paths and configuration files were" + ewarn "changed to reflect upstream intentions better. Notable changes are:" + ewarn + ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script." + ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg" + ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE" + ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start." + ewarn + ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides" + ewarn "at standard location: /etc/ssl/ejabberd/server.pem." + ewarn + ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie" + ewarn + ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log" + ewarn + ewarn "5. Crash dumps (if any) will be located at /var/log/jabber" + + local i ctlcfg new_ctlcfg + i=0 + ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg + while :; do + new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i}) + [[ ! -e ${new_ctlcfg} ]] && break + ctlcfg=${new_ctlcfg} + ((i++)) + done + + ewarn + ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})" + sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die + + if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then + ewarn "Moving .erlang.cookie..." + if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then + mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak} + fi + mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie + fi + ewarn + ewarn "We'll try to handle upgrade automagically but, please, do your" + ewarn "own checks and do not forget to run 'etc-update'!" + ewarn "PLEASE! Run 'etc-update' now!" + fi + + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}" + install_cert /etc/ssl/ejabberd/server + if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then + ewarn + ewarn "The location of SSL certificates has changed. If you are" + ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier you might" + ewarn "want to move your old certificates from /etc/jabber into" + ewarn "/etc/ssl/ejabberd/, update config files and" + ewarn "rm /etc/jabber/ssl.pem to avoid this message." + ewarn + fi +} -- cgit v1.2.3-65-gdbad