diff options
author | 2010-05-26 19:59:08 +0000 | |
---|---|---|
committer | 2010-05-26 19:59:08 +0000 | |
commit | b65a030999ae75f6facd0045a0a4d99e2b41f7f6 (patch) | |
tree | dc24a755666437b05c85a5bb1c06346312b21d08 | |
parent | net-im/ejabberd: cleaned init script to avoid upgrading code. We fix configs,... (diff) | |
download | pva-b65a030999ae75f6facd0045a0a4d99e2b41f7f6.tar.gz pva-b65a030999ae75f6facd0045a0a4d99e2b41f7f6.tar.bz2 pva-b65a030999ae75f6facd0045a0a4d99e2b41f7f6.zip |
net-im/ejabberd: another small cleanup.
svn path=/; revision=426
-rw-r--r-- | net-im/ejabberd/Manifest | 2 | ||||
-rw-r--r-- | net-im/ejabberd/ejabberd-2.1.3.ebuild | 49 |
2 files changed, 27 insertions, 24 deletions
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 4077da8..06b84aa 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -2,6 +2,6 @@ AUX 2.1.1-mod_statsdx.patch 66647 RMD160 b4563c29a827d1452ca70b68bb8cb1989e6104d AUX ejabberd-3.confd 161 RMD160 3b2c2b2a871c42c75e854a3c592c0d399a5dd387 SHA1 01e72bda178e7bf26a66321c4330bbcc1607e540 SHA256 0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386 AUX ejabberd-3.initd 369 RMD160 092cbf1d96a92f9a984cce9531c13ee3d022a033 SHA1 e74d6707719959786fd6fd46c4a9ba0714320661 SHA256 31daeafe003a0c13d51e8aaa9aa3c067ba3006e5edb1a47401a36c6d712be651 DIST ejabberd-2.1.3.tar.gz 2243874 RMD160 c57672928e30f71ec66636dd5e76adb802f17b03 SHA1 77fdf18c0bb3b25cf9045e0c833ba4d82f180469 SHA256 602c6e4e742c4cab8594e9f049f08d0bf2125fa84af491e0ceb6d6f2f3854ef6 -EBUILD ejabberd-2.1.3.ebuild 7642 RMD160 674d006a9ed5aef5191f3df95ee23a924fd4978a SHA1 0d32f605e534a576039e1e1cc9357622b394258d SHA256 bb8848945c5c1672954e710bd891c6f51434bfc4fc8c5001e7fe0fcc97a56c2f +EBUILD ejabberd-2.1.3.ebuild 7773 RMD160 6b53ee7873b2edff2a2f7b6d7849e6666d8130f1 SHA1 ae861d5b931bb3fcc5d89642438bebdc8e8335cd SHA256 47b79791b097e4df299dab950a2a4a4d48755e37c58d6d5367793808698648d1 MISC ChangeLog 8965 RMD160 325a316bff3eb3d4c61170084e81dcebef9ad71c SHA1 f9b2b52117fc679eaf49884eae4cd059e40bf8f8 SHA256 016e4ed223c68bd48b80c59d0780c7b7e68753046da8dd83c59fb6eeec83683a MISC metadata.xml 876 RMD160 48f50045291f78f0dbd699136b8546b5dfa55d85 SHA1 48dbaf3f6c2eaf5db190c04c881502b4da18a779 SHA256 25fd9d709d98bcfaba02200e29e07b1cc34d6241be0ffa2a7ea1abb52c05d282 diff --git a/net-im/ejabberd/ejabberd-2.1.3.ebuild b/net-im/ejabberd/ejabberd-2.1.3.ebuild index 462f079..2adeabd 100644 --- a/net-im/ejabberd/ejabberd-2.1.3.ebuild +++ b/net-im/ejabberd/ejabberd-2.1.3.ebuild @@ -24,21 +24,20 @@ DEPEND=">=net-im/jabber-base-0.01 ssl? ( >=dev-libs/openssl-0.9.8e ) captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( sys-libs/zlib )" +#>=sys-apps/shadow-4.1.4.2-r2 - fixes bug in su that made ejabberdctl unworkable. RDEPEND="${DEPEND} >=sys-apps/shadow-4.1.4.2-r2" -#>=sys-apps/shadow-4.1.4.2-r2 - fixes bug in su that made ejabberdctl unworkable. - PROVIDE="virtual/jabber-server" S=${WORKDIR}/${P}/src # pathes in net-im/jabber-base -JABBER_ETC="/etc/jabber" +JABBER_ETC="${EPREFIX}/etc/jabber" #JABBER_RUN="/var/run/jabber" -JABBER_SPOOL="/var/spool/jabber" -JABBER_LOG="/var/log/jabber" -JABBER_DOC="/usr/share/doc/${PF}" +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 @@ -127,20 +126,20 @@ src_install() { 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/projects/ejabberd/docs/guide_en.html" + elog "http://www.process-one.net/en/ejabberd/docs/guide_en/" if ! use web ; then - elog + ewarn ewarn "The web USE flag is off, this has disabled the web admin interface." - elog + ewarn fi elog elog '====================================================================' elog 'Quick Start Guide:' - elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 89' + 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 324' + 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' @@ -149,11 +148,6 @@ pkg_postinst() { elog '5) Log in with your favourite jabber client or using the web admin' # Upgrading from ejabberd-2.0.x: - # 1. To keep ejabberd bootable we need to move EJABBERD_NODE from - # /etc/conf.d/ejebberd into ERLANG_NODE inside /etc/jabberd/ejabberdctl.cfg - # /etc/conf.d/ejabberd is handled by PM but everything else is our job - # 2. Copy cookie - # 3. Copy ssl certificate if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then source "${EROOT}/etc/conf.d/ejabberd" ewarn @@ -171,8 +165,9 @@ pkg_postinst() { ewarn ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie" 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 "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 @@ -189,21 +184,29 @@ pkg_postinst() { sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then - einfo "Moving .erlang.cookie..." + 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 if use ssl; then SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}" + install_cert /etc/ssl/ejabberd/server if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then - einfo "Moving SSL certificate to new location..." - mkdir -p "${EROOT}/etc/ssl/ejabberd/" - mv -v "${EROOT}/etc/jabber/ssl.pem" "${EROOT}/etc/ssl/ejabberd/server.pem" + 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 - install_cert /etc/ssl/ejabberd/server fi } |