diff options
| -rw-r--r-- | dev-db/neo4j-community/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch | 23 | ||||
| -rw-r--r-- | dev-db/neo4j-community/files/neo4j-community-1.7-server_properties.patch | 47 | ||||
| -rw-r--r-- | dev-db/neo4j-community/files/neo4j-community-1.7-server_settings.patch | 24 | ||||
| -rw-r--r-- | dev-db/neo4j-community/files/neo4j-community-1.7-utils.patch | 31 | ||||
| -rw-r--r-- | dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_configuration.patch (renamed from dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_settings.patch) | 13 | ||||
| -rw-r--r-- | dev-db/neo4j-community/neo4j-community-1.7.ebuild | 5 |
7 files changed, 121 insertions, 32 deletions
diff --git a/dev-db/neo4j-community/ChangeLog b/dev-db/neo4j-community/ChangeLog index d5f8739..1b1f157 100644 --- a/dev-db/neo4j-community/ChangeLog +++ b/dev-db/neo4j-community/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header:$ + 24 Apr 2012; Leonardo Martins <leonardo@venidera.com> + files/neo4j-community-1.7-neo4j.patch, + +files/neo4j-community-1.7-utils.patch, + -files/neo4j-community-1.7-server_settings.patch, + -files/neo4j-community-1.7-wrapper_settings.patch, + +files/neo4j-community-1.7-wrapper_configuration.patch, + +files/neo4j-community-1.7/server_properties.patch, + neo4j-community-1.7.ebuild: + Added patches to Gentoofy data path. + 24 Apr 2012; Leonardo Martins <leonardo@venidera.com> +files/neo4j-community-1.7-neo4j.patch, +files/neo4j-community-1.7-server_settings.patch, diff --git a/dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch b/dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch index f6ab8e4..63c9fab 100644 --- a/dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch +++ b/dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch @@ -1,5 +1,5 @@ --- bin/neo4j.orig 2012-04-24 09:25:46.000000000 -0300 -+++ bin/neo4j 2012-04-24 09:52:31.000000000 -0300 ++++ bin/neo4j 2012-04-24 15:26:38.000000000 -0300 @@ -51,26 +51,25 @@ function parseConfig { if [ ${BASH_VERSINFO[0]} -eq 3 ] ; then @@ -32,6 +32,15 @@ NEO4J_SERVER_PORT=${org_neo4j_server_webserver_port:=7474} LAUNCHD_NAME="${LAUNCHD_NAME}.${NEO4J_SERVER_PORT}" +@@ -92,7 +91,7 @@ + + TIMEOUT=20 + +-PID_FILE=${NEO4J_INSTANCE}/data/neo4j-service.pid ++PID_FILE=/var/db/neo4j/neo4j-service.pid + buildclasspath() { + # confirm library jars + LIBDIR="$NEO4J_HOME"/lib @@ -140,16 +139,16 @@ checkupgrade() { @@ -55,7 +64,7 @@ -Dneo4j.home="${NEO4J_HOME}" -Dneo4j.instance="${NEO4J_INSTANCE}" \ org.neo4j.server.storemigration.PreStartupStoreUpgrader fi -@@ -200,18 +199,18 @@ +@@ -200,20 +199,20 @@ checkandrepairenv if [ $UID == 0 ] ; then @@ -67,7 +76,8 @@ + -Djava.util.logging.config.file=\"/etc/neo4j/conf/logging.properties\" \ -Dneo4j.home=\"${NEO4J_HOME}\" -Dneo4j.instance=\"${NEO4J_INSTANCE}\" \ -Dfile.encoding=UTF-8 \ - org.neo4j.server.Bootstrapper >> \"$NEO4J_INSTANCE/data/log/console.log\" 2>&1 & echo \$! > \"$PID_FILE\" " +- org.neo4j.server.Bootstrapper >> \"$NEO4J_INSTANCE/data/log/console.log\" 2>&1 & echo \$! > \"$PID_FILE\" " ++ org.neo4j.server.Bootstrapper >> \"/var/db/neo4j/log/console.log\" 2>&1 & echo \$! > \"$PID_FILE\" " else checkwriteaccess echo "WARNING: not changing user" @@ -78,8 +88,11 @@ + -Dorg.neo4j.server.properties="/etc/neo4j/neo4j-server.properties" \ + -Djava.util.logging.config.file="/etc/neo4j/logging.properties" \ -Dneo4j.home="${NEO4J_HOME}" -Dneo4j.instance="${NEO4J_INSTANCE}" \ - org.neo4j.server.Bootstrapper >> "${NEO4J_INSTANCE}/data/log/console.log" 2>&1 & echo $! > "${PID_FILE}" +- org.neo4j.server.Bootstrapper >> "${NEO4J_INSTANCE}/data/log/console.log" 2>&1 & echo $! > "${PID_FILE}" ++ org.neo4j.server.Bootstrapper >> "/var/db/neo4j/log/console.log" 2>&1 & echo $! > "${PID_FILE}" fi + STARTED_PID=$( cat "$PID_FILE" ) + @@ -274,9 +273,9 @@ checkwriteaccess checkandrepairenv @@ -121,7 +134,7 @@ ln -s "${SCRIPT_NAME}" "/etc/init.d/${SERVICE_NAME}" update-rc.d ${SERVICE_NAME} defaults - chown -R $proposed_user: "$NEO4J_HOME/data" "$NEO4J_HOME/conf" -+ chown -R $proposed_user: "$NEO4J_HOME/data" "/etc/neo4j" ++ chown -R $proposed_user: "/var/db/neo4j" "/etc/neo4j" fi fi elif [[ $DIST_OS -eq "macosx" ]] ; then diff --git a/dev-db/neo4j-community/files/neo4j-community-1.7-server_properties.patch b/dev-db/neo4j-community/files/neo4j-community-1.7-server_properties.patch new file mode 100644 index 0000000..507c62b --- /dev/null +++ b/dev-db/neo4j-community/files/neo4j-community-1.7-server_properties.patch @@ -0,0 +1,47 @@ +--- conf/neo4j-server.properties.orig 2012-04-24 09:07:58.000000000 -0300 ++++ conf/neo4j-server.properties 2012-04-24 15:42:01.000000000 -0300 +@@ -8,7 +8,7 @@ + #*************************************************************** + + # location of the database directory +-org.neo4j.server.database.location=data/graph.db ++org.neo4j.server.database.location=/var/db/neo4j/graph.db + + # let the webserver only listen on the specified IP. Default + # is localhost (only accept local connections). Uncomment to allow +@@ -34,14 +34,14 @@ + org.neo4j.server.webserver.https.port=7473 + + # Certificate location (auto generated if the file does not exist) +-org.neo4j.server.webserver.https.cert.location=conf/ssl/snakeoil.cert ++org.neo4j.server.webserver.https.cert.location=/etc/neo4j/ssl/snakeoil.cert + + # Private key location (auto generated if the file does not exist) +-org.neo4j.server.webserver.https.key.location=conf/ssl/snakeoil.key ++org.neo4j.server.webserver.https.key.location=/etc/neo4j/ssl/snakeoil.key + + # Internally generated keystore (don't try to put your own + # keystore there, it will get deleted when the server starts) +-org.neo4j.server.webserver.https.keystore.location=data/keystore ++org.neo4j.server.webserver.https.keystore.location=/var/db/neo4j/keystore + + #***************************************************************** + # Administration client configuration +@@ -51,7 +51,7 @@ + # - absolute path like /var/rrd + # - path relative to the server working directory like data/rrd + # - commented out, will default to the database data directory. +-org.neo4j.server.webadmin.rrdb.location=data/rrd ++org.neo4j.server.webadmin.rrdb.location=/var/db/neo4j/rrd + + # REST endpoint for the data API + # Note the / in the end is mandatory +@@ -61,7 +61,7 @@ + org.neo4j.server.webadmin.management.uri=/db/manage/ + + # Low-level graph engine tuning file +-org.neo4j.server.db.tuning.properties=conf/neo4j.properties ++org.neo4j.server.db.tuning.properties=/etc/neo4j/neo4j.properties + + + #Comma separated list of JAXRS packages contains JAXRS Resoruce, one package name for each mountpoint. diff --git a/dev-db/neo4j-community/files/neo4j-community-1.7-server_settings.patch b/dev-db/neo4j-community/files/neo4j-community-1.7-server_settings.patch deleted file mode 100644 index ee83ca2..0000000 --- a/dev-db/neo4j-community/files/neo4j-community-1.7-server_settings.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- conf/neo4j-server.properties.orig 2012-04-24 09:07:58.000000000 -0300 -+++ conf/neo4j-server.properties 2012-04-24 09:22:04.000000000 -0300 -@@ -34,10 +34,10 @@ - org.neo4j.server.webserver.https.port=7473 - - # Certificate location (auto generated if the file does not exist) --org.neo4j.server.webserver.https.cert.location=conf/ssl/snakeoil.cert -+org.neo4j.server.webserver.https.cert.location=/etc/neo4j/ssl/snakeoil.cert - - # Private key location (auto generated if the file does not exist) --org.neo4j.server.webserver.https.key.location=conf/ssl/snakeoil.key -+org.neo4j.server.webserver.https.key.location=/etc/neo4j/ssl/snakeoil.key - - # Internally generated keystore (don't try to put your own - # keystore there, it will get deleted when the server starts) -@@ -61,7 +61,7 @@ - org.neo4j.server.webadmin.management.uri=/db/manage/ - - # Low-level graph engine tuning file --org.neo4j.server.db.tuning.properties=conf/neo4j.properties -+org.neo4j.server.db.tuning.properties=/etc/neo4j/neo4j.properties - - - #Comma separated list of JAXRS packages contains JAXRS Resoruce, one package name for each mountpoint. diff --git a/dev-db/neo4j-community/files/neo4j-community-1.7-utils.patch b/dev-db/neo4j-community/files/neo4j-community-1.7-utils.patch new file mode 100644 index 0000000..92d9340 --- /dev/null +++ b/dev-db/neo4j-community/files/neo4j-community-1.7-utils.patch @@ -0,0 +1,31 @@ +--- bin/utils.orig 2012-04-24 15:37:50.000000000 -0300 ++++ bin/utils 2012-04-24 15:29:25.000000000 -0300 +@@ -121,8 +121,8 @@ + + checkwriteaccess() { + if [ $UID != 0 ] ; then +- if [ ! -w "$NEO4J_INSTANCE/data" ] ; then +- echo "ERROR: No write access to data/ directory, run either as user $NEO4J_USER or root" ++ if [ ! -w /var/db/neo4j ] ; then ++ echo "ERROR: No write access to /var/db/neo4j, run either as user $NEO4J_USER or root" + exit 1 + fi + fi +@@ -301,12 +301,12 @@ + # Runs before the server command, making sure that whatever should be in place is + # in place. + checkandrepairenv() { +- # Create data/log if missing, change owner if created. +- if [ ! -d "$NEO4J_HOME"/data/log ]; then +- echo "${NEO4J_HOME}/data/log was missing, recreating..." +- mkdir "$NEO4J_HOME"/data/log ++ # Create /var/db/neo4j/log if missing, change owner if created. ++ if [ ! -d /var/db/neo4j/log ]; then ++ echo "/var/db/neo4j/log was missing, recreating..." ++ mkdir /var/db/neo4j/log + if [ $UID == 0 ] ; then +- chown $NEO4J_USER "$NEO4J_HOME"/data/log ++ chown $NEO4J_USER /var/db/neo4j/log + fi + fi + } diff --git a/dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_settings.patch b/dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_configuration.patch index 3a3fac7..891521c 100644 --- a/dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_settings.patch +++ b/dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_configuration.patch @@ -1,5 +1,5 @@ --- conf/neo4j-wrapper.conf.orig 2012-04-24 09:08:14.000000000 -0300 -+++ conf/neo4j-wrapper.conf 2012-04-24 09:17:22.000000000 -0300 ++++ conf/neo4j-wrapper.conf 2012-04-24 15:43:09.000000000 -0300 @@ -2,8 +2,8 @@ # JVM Parameters #******************************************************************** @@ -11,3 +11,14 @@ wrapper.java.additional.3=-Dfile.encoding=UTF-8 # Uncomment the following line to enable garbage collection logging +@@ -19,8 +19,8 @@ + # Wrapper settings + #******************************************************************** + # Override default pidfile and lockfile +-#wrapper.pidfile=../data/neo4j-server.pid +-#wrapper.lockfile=../data/neo4j-server.lck ++wrapper.pidfile=/var/db/neo4j/neo4j-server.pid ++wrapper.lockfile=/var/db/neo4j/neo4j-server.lck + + #******************************************************************** + # Wrapper Windows NT/2000/XP Service Properties diff --git a/dev-db/neo4j-community/neo4j-community-1.7.ebuild b/dev-db/neo4j-community/neo4j-community-1.7.ebuild index 032e7af..1e92ef3 100644 --- a/dev-db/neo4j-community/neo4j-community-1.7.ebuild +++ b/dev-db/neo4j-community/neo4j-community-1.7.ebuild @@ -22,8 +22,9 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-neo4j.patch" - epatch "${FILESDIR}/${P}-wrapper_settings.patch" - epatch "${FILESDIR}/${P}-server_settings.patch" + epatch "${FILESDIR}/${P}-utils.patch" + epatch "${FILESDIR}/${P}-wrapper_configuration.patch" + epatch "${FILESDIR}/${P}-server_properties.patch" } src_install() { |