diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2008-04-08 07:55:34 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2008-04-08 07:55:34 +0000 |
| commit | fbbee52fb86fa5cd1aaecb160b22fa1a969b6f08 (patch) | |
| tree | 73c3da3c83c7bd2e6bd5d2619bab89aff0ac13a3 /www-servers | |
| parent | Stable for HPPA (bug #215071). (diff) | |
| download | gentoo-2-fbbee52fb86fa5cd1aaecb160b22fa1a969b6f08.tar.gz gentoo-2-fbbee52fb86fa5cd1aaecb160b22fa1a969b6f08.tar.bz2 gentoo-2-fbbee52fb86fa5cd1aaecb160b22fa1a969b6f08.zip | |
Fix config location, see bug #216832.
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/resin/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/resin/files/3.1.5/resin.init | 4 | ||||
| -rw-r--r-- | www-servers/resin/resin-3.1.5.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog index 227b2b704264..69eb7a11f9e7 100644 --- a/www-servers/resin/ChangeLog +++ b/www-servers/resin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/resin # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.67 2008/03/17 16:33:53 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.68 2008/04/08 07:55:33 nelchael Exp $ + + 08 Apr 2008; Krzysiek Pawlik <nelchael@gentoo.org> files/3.1.5/resin.init, + resin-3.1.5.ebuild: + Fix config location, see bug #216832. 17 Mar 2008; Krzysiek Pawlik <nelchael@gentoo.org> +files/3.1.5/resin.conf, +files/3.1.5/resin.init: diff --git a/www-servers/resin/files/3.1.5/resin.init b/www-servers/resin/files/3.1.5/resin.init index 3b6bc745fbbf..c3e45552300e 100644 --- a/www-servers/resin/files/3.1.5/resin.init +++ b/www-servers/resin/files/3.1.5/resin.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.5/resin.init,v 1.1 2008/03/17 16:34:04 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.5/resin.init,v 1.2 2008/04/08 07:55:34 nelchael Exp $ depend() { need net @@ -22,7 +22,7 @@ runResin() { local msg="${1}" shift - local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar ${extraArgs} -resin-home /usr/lib/resin ${@}" + local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.conf -resin-home /usr/lib/resin ${extraArgs} ${@}" ebegin "${msg}" su - resin -c "${cmdline}" diff --git a/www-servers/resin/resin-3.1.5.ebuild b/www-servers/resin/resin-3.1.5.ebuild index 5a5410330391..5e473dbc1834 100644 --- a/www-servers/resin/resin-3.1.5.ebuild +++ b/www-servers/resin/resin-3.1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild,v 1.1 2008/02/27 22:06:36 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild,v 1.2 2008/04/08 07:55:33 nelchael Exp $ EAPI="1" @@ -122,7 +122,7 @@ src_install() { java-pkg_dojar "${S}"/lib/*.jar rm -fr "${D}/${RESIN_HOME}/lib" dosym /usr/share/resin/lib ${RESIN_HOME}/lib - keepdir /usr/share/resin/log + dosym /var/log/resin /usr/share/resin/log dodir /var/lib/resin/webapps mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" |