update to 2.4.1

This commit is contained in:
Micha Glave 2011-11-22 15:02:54 +01:00
parent 3ecd9dab56
commit 27a07a8dc5
4 changed files with 22 additions and 9 deletions

View File

@ -1,3 +1,4 @@
AUX artifactory.initd 833 RMD160 8e076445998d939fbe7080f3ce12f0efd027d218 SHA1 39b62d863b2184967d4e051e0b02b069b10b134d SHA256 2ee9e266be89841ac1920613370441cc598665c0bb58ae96a320390aafc0342f AUX artifactory.confd 729 RMD160 810db10baee3161591a850cb5d70926f7f6e3233 SHA1 740581f0324063d11384385d51804e4efe0c9448 SHA256 81df9fa9ca65259199a1a844c45cd7c58e07565ef89369af54e198421a40f69c
DIST artifactory-2.3.3.1.zip 35982504 RMD160 6941e17f7d9e47e6b3f495fff07e3f36caa0266d SHA1 7905760a641aa5ed6fb58215a13039f4b38e0fac SHA256 23a457028f23dbe5c29107cdf3a62ecceb098565d2c4567fe3bbd085ad5b1c89 AUX artifactory.initd 1054 RMD160 435d6b3d97905e254ac7714e2621a42cef6c5609 SHA1 38a6308a0e60d464b41f6b2cd94607bf25e52c6e SHA256 c94ddfda9aa088d76269678eba73817092cc2421752440d63d3f1b2ae6bdb845
EBUILD artifactory-2.3.3.1.ebuild 1163 RMD160 6adc4a215bb6309988a154d750ab77f236a14fda SHA1 f0eb38b63e1d1fec86630abb89ed8ca585c66ced SHA256 dd01fd01540d200122cf41030e2166a168cd98a90aeca83df30e8f0a198a0a0d DIST artifactory-2.4.1.zip 33661456 RMD160 89e99581f1d5c8d824c39f18186220b6d292155b SHA1 3ee96e45697ccd3c7a27f000445c97a08113a3d7 SHA256 b49bb9b1130b37779ad0cf76443454f51c449aa0125fb114800c0cb2548e0187
EBUILD artifactory-2.4.1.ebuild 2853 RMD160 07c33b2e0706181130d6951c18ffbe69b7a9b9ec SHA1 72803c6d23a5289432cd81c2a2ef8cb0991db297 SHA256 ea3fc1d580ad3ba9c2b75a948a49160a9909bb860be2fa118d9ee8c37c13c112

View File

@ -7,6 +7,7 @@ DESCRIPTION="Artifactory Maven Artifact Server"
HOMEPAGE="http://www.jfrog.org/products.php" HOMEPAGE="http://www.jfrog.org/products.php"
SLOT="0" SLOT="0"
RESTRICT="mirror"
SRC_URI="mirror://sourceforge/${PN}/${P}.zip" SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
@ -14,7 +15,10 @@ LICENSE="LGPL-3"
IUSE="mysql derby postgres" IUSE="mysql derby postgres"
RDEPEND=">=virtual/jre-1.5" RDEPEND=">=virtual/jre-1.5"
DEPEND=">=virtual/jdk-1.5" DEPEND=">=virtual/jdk-1.5
dev-java/jsr305
mysql? ( dev-java/jdbc-mysql )
"
ARTIFACTORY_HOME=/var/lib/${PN} ARTIFACTORY_HOME=/var/lib/${PN}
ARTIFACTORY_INSTALL=/usr/share/${PN} ARTIFACTORY_INSTALL=/usr/share/${PN}
@ -55,7 +59,7 @@ src_install() {
# remove unneeded configs # remove unneeded configs
rm -r ${S}/etc/repo/*mssql rm -r ${S}/etc/repo/*mssql
rm -r ${S}/etc/repo/oracle10 rm -r ${S}/etc/repo/*oracle*
if ! use derby; then if ! use derby; then
rm -r ${S}/etc/repo/*derby rm -r ${S}/etc/repo/*derby
fi fi
@ -66,7 +70,8 @@ src_install() {
rm -r ${S}/etc/repo/*postgresql rm -r ${S}/etc/repo/*postgresql
fi fi
# remove windows-wrapper chown ${ARTIFACTORY_USER}:artifact ${S}/etc/repo
# remove windows-wrapper
rm ${S}/lib/wrapper* rm ${S}/lib/wrapper*
sed -i -e "s:<SystemProperty name=\"artifactory.home\" default=\"..\"/>/webapps:${ARTIFACTORY_INSTALL}/webapps:" "${S}"/etc/jetty.xml sed -i -e "s:<SystemProperty name=\"artifactory.home\" default=\"..\"/>/webapps:${ARTIFACTORY_INSTALL}/webapps:" "${S}"/etc/jetty.xml
@ -80,11 +85,11 @@ src_install() {
exeinto /usr/bin exeinto /usr/bin
doexe bin/artadmin doexe bin/artadmin
# doexe bin/artifactory.sh
newinitd "${FILESDIR}"/artifactory.initd artifactory newinitd "${FILESDIR}"/artifactory.initd artifactory
newconfd "${FILESDIR}"/artifactory.confd artifactory newconfd "${FILESDIR}"/artifactory.confd artifactory
elog "Artifact storage is /var/lib/artifact. Ensure that there is enough space." elog "Artifact storage is /var/lib/artifact. Ensure that there is enough space."
elog "The default password for user 'admin' is 'password'." elog "The default password for user 'admin' is 'password'."
elog "After upgrading clean up the jetty-dir '${ARTIFACTORY_INSTALL}/work'"
} }

View File

@ -9,6 +9,12 @@ ARTIFACTORY_INSTALL="/usr/share/artifactory"
# Options for artifacory # Options for artifacory
ARTIFACTORY_OPTS="" ARTIFACTORY_OPTS=""
# JSR 305 support for non sun/oracle VMs
JDBC_JAR="/usr/share/jsr305/lib/jsr305.jar"
# adding JDBC to the classpath choose the needed.
#JDBC_JAR="${JDBC_JAR}:/usr/share/jdbc-mysql/lib/jdbc-mysql.jar"
#JDBC_JAR="${JDBC_JAR}:/usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar"
# User and group as which to run artifactory # User and group as which to run artifactory
#ARTIFACTORY_USER="artifact" #ARTIFACTORY_USER="artifact"
#ARTIFACTORY_GROUP="artifact" #ARTIFACTORY_GROUP="artifact"

View File

@ -18,9 +18,10 @@ start() {
do do
CLASSPATH="$CLASSPATH:$i" CLASSPATH="$CLASSPATH:$i"
done done
CLASSPATH="$CLASSPATH:$JDBC_JAR"
start-stop-daemon --start --chuid ${ARTIFACTORY_USER:-artifact}:${ARTIFACTORY_GROUP:-artifact} \ start-stop-daemon --start --user ${ARTIFACTORY_USER:-artifact}:${ARTIFACTORY_GROUP:-artifact} \
-t --chdir "/var/lib/artifactory" \ --chdir "/var/lib/artifactory" \
--pidfile /var/run/artifactory.pid --make-pidfile --background \ --pidfile /var/run/artifactory.pid --make-pidfile --background \
--exec "$JAVACMD" -- $JAVA_OPTIONS -cp "$CLASSPATH" org.artifactory.standalone.main.Main --exec "$JAVACMD" -- $JAVA_OPTIONS -cp "$CLASSPATH" org.artifactory.standalone.main.Main
eend $? eend $?