aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Martins <leonardo@venidera.com>2012-04-24 15:50:22 -0300
committerLeonardo Martins <leonardo@venidera.com>2012-04-24 15:50:22 -0300
commit18e40d0099987a847ad3fe9c5c2f4cb9f55f3500 (patch)
tree03c8b8630bda52919165a774bf3ec1b78f153246 /dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch
parentAdded commands to create data directories under /var/db (diff)
downloadvenidera-18e40d0099987a847ad3fe9c5c2f4cb9f55f3500.tar.gz
venidera-18e40d0099987a847ad3fe9c5c2f4cb9f55f3500.tar.bz2
venidera-18e40d0099987a847ad3fe9c5c2f4cb9f55f3500.zip
Added patches to Gentoofy data directory
Diffstat (limited to 'dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch')
-rw-r--r--dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch23
1 files changed, 18 insertions, 5 deletions
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