aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Martins <leonardo@venidera.com>2012-04-24 14:22:35 -0300
committerLeonardo Martins <leonardo@venidera.com>2012-04-24 14:22:35 -0300
commit8ab30466aad5f93697d916fcdaa029a13708c7ae (patch)
treedb9405b8e218ef0fe3139a9357dd42d38d93ec58 /dev-db/neo4j/files/neo4j-1.7-neo4j.patch
parentAdded patches for Gentoo-style configuration path (diff)
downloadvenidera-8ab30466aad5f93697d916fcdaa029a13708c7ae.tar.gz
venidera-8ab30466aad5f93697d916fcdaa029a13708c7ae.tar.bz2
venidera-8ab30466aad5f93697d916fcdaa029a13708c7ae.zip
Renamed dev-db/neo4j-community to dev-db/neo4j
Diffstat (limited to 'dev-db/neo4j/files/neo4j-1.7-neo4j.patch')
-rw-r--r--dev-db/neo4j/files/neo4j-1.7-neo4j.patch127
1 files changed, 127 insertions, 0 deletions
diff --git a/dev-db/neo4j/files/neo4j-1.7-neo4j.patch b/dev-db/neo4j/files/neo4j-1.7-neo4j.patch
new file mode 100644
index 0000000..f6ab8e4
--- /dev/null
+++ b/dev-db/neo4j/files/neo4j-1.7-neo4j.patch
@@ -0,0 +1,127 @@
+--- bin/neo4j.orig 2012-04-24 09:25:46.000000000 -0300
++++ bin/neo4j 2012-04-24 09:52:31.000000000 -0300
+@@ -51,26 +51,25 @@
+ function parseConfig {
+ if [ ${BASH_VERSINFO[0]} -eq 3 ] ; then
+ if [ ${BASH_VERSINFO[1]} -lt 2 ] ; then
+- getconfigquoted "${NEO4J_INSTANCE}/conf/neo4j-wrapper.conf"
+- getconfigquoted "${NEO4J_INSTANCE}/conf/neo4j-server.properties"
++ getconfigquoted "/etc/neo4j/neo4j-wrapper.conf"
++ getconfigquoted "/etc/neo4j/neo4j-server.properties"
+ return
+ fi
+ fi
+- getconfig "${NEO4J_INSTANCE}/conf/neo4j-wrapper.conf"
+- getconfig "${NEO4J_INSTANCE}/conf/neo4j-server.properties"
++ getconfig "/etc/neo4j/neo4j-wrapper.conf"
++ getconfig "/etc/neo4j/neo4j-server.properties"
+ }
+
+ findBaseDirAndCdThere
+ source bin/utils
+ parseConfig
+
+-NEO4J_OPTS="-Dlog4j.configuration=file:conf/log4j.properties -Dorg.neo4j.server.properties="${NEO4J_INSTANCE}"/conf/neo4j-server.properties -Djava.util.logging.config.file="${NEO4J_INSTANCE}/conf/logging.properties" -Dneo4j.home="${NEO4J_HOME}" -Dneo4j.instance="${NEO4J_INSTANCE}""
++NEO4J_OPTS="-Dlog4j.configuration=file:/etc/neo4j/log4j.properties -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}""
+
+ JAVA_OPTS="-server -XX:+DisableExplicitGC ${wrapper_java_additional}"
+ [ -z "${wrapper_java_initmemory}" ] || JAVA_OPTS="$JAVA_OPTS -Xms${wrapper_java_initmemory}m"
+ [ -z "${wrapper_java_maxmemory}" ] || JAVA_OPTS="$JAVA_OPTS -Xmx${wrapper_java_maxmemory}m"
+
+-#NEO4J_SERVER_PORT=`( egrep "^org.neo4j.server.webserver.port" $NEO4J_INSTANCE/conf/neo4j-server.properties || echo 7474 ) | sed -e 's/.*=//'`
+ NEO4J_SERVER_PORT=${org_neo4j_server_webserver_port:=7474}
+
+ LAUNCHD_NAME="${LAUNCHD_NAME}.${NEO4J_SERVER_PORT}"
+@@ -140,16 +139,16 @@
+
+ checkupgrade() {
+ if [ $UID == 0 ] ; then
+- su $NEO4J_USER -c "$JAVACMD -cp '$CLASSPATH' $JAVA_OPTS -Dlog4j.configuration=file:conf/log4j.properties \
+- -Dorg.neo4j.server.properties=\"${NEO4J_INSTANCE}/conf/neo4j-server.properties\" \
+- -Djava.util.logging.config.file=\"${NEO4J_INSTANCE}/conf/logging.properties\" \
++ su $NEO4J_USER -c "$JAVACMD -cp '$CLASSPATH' $JAVA_OPTS -Dlog4j.configuration=file:/etc/neo4j/log4j.properties \
++ -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.storemigration.PreStartupStoreUpgrader"
+ else
+ checkwriteaccess
+- $JAVACMD -cp "${CLASSPATH}" $JAVA_OPTS -Dlog4j.configuration=file:conf/log4j.properties \
+- -Dorg.neo4j.server.properties="${NEO4J_INSTANCE}/conf/neo4j-server.properties" \
+- -Djava.util.logging.config.file="${NEO4J_INSTANCE}/conf/logging.properties" \
++ $JAVACMD -cp "${CLASSPATH}" $JAVA_OPTS -Dlog4j.configuration=file:/etc/neo4j/log4j.properties \
++ -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.storemigration.PreStartupStoreUpgrader
+ fi
+@@ -200,18 +199,18 @@
+ checkandrepairenv
+
+ if [ $UID == 0 ] ; then
+- su $NEO4J_USER -c "$JAVACMD -cp '$CLASSPATH' $JAVA_OPTS -Dlog4j.configuration=file:conf/log4j.properties \
+- -Dorg.neo4j.server.properties=\"${NEO4J_INSTANCE}/conf/neo4j-server.properties\" \
+- -Djava.util.logging.config.file=\"${NEO4J_INSTANCE}/conf/logging.properties\" \
++ su $NEO4J_USER -c "$JAVACMD -cp '$CLASSPATH' $JAVA_OPTS -Dlog4j.configuration=file:/etc/neo4j/log4j.properties \
++ -Dorg.neo4j.server.properties=\"/etc/neo4j/neo4j-server.properties\" \
++ -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\" "
+ else
+ checkwriteaccess
+ echo "WARNING: not changing user"
+- $JAVACMD -cp "${CLASSPATH}" $JAVA_OPTS -Dlog4j.configuration=file:conf/log4j.properties \
+- -Dorg.neo4j.server.properties="${NEO4J_INSTANCE}/conf/neo4j-server.properties" \
+- -Djava.util.logging.config.file="${NEO4J_INSTANCE}/conf/logging.properties" \
++ $JAVACMD -cp "${CLASSPATH}" $JAVA_OPTS -Dlog4j.configuration=file:/etc/neo4j/log4j.properties \
++ -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}"
+ fi
+@@ -274,9 +273,9 @@
+ checkwriteaccess
+ checkandrepairenv
+
+- $JAVACMD -cp "${CLASSPATH}" $JAVA_OPTS -Dlog4j.configuration=file:conf/log4j.properties \
+- -Dorg.neo4j.server.properties="${NEO4J_INSTANCE}/conf/neo4j-server.properties" \
+- -Djava.util.logging.config.file="${NEO4J_INSTANCE}/conf/logging.properties" \
++ $JAVACMD -cp "${CLASSPATH}" $JAVA_OPTS -Dlog4j.configuration=file:/etc/neo4j/log4j.properties \
++ -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
+
+@@ -291,16 +290,16 @@
+ # pass in "true" for created to mark that the user was created (instead than pre-existing)
+ modify_user_config() {
+ created=${2:-"false"}
+- if `grep -q "wrapper\.user=" "$NEO4J_INSTANCE/conf/neo4j-wrapper.conf"` ; then
+- sed -i -e "s/^.*wrapper\.user=.*$/wrapper\.user=$1/" "$NEO4J_INSTANCE/conf/neo4j-wrapper.conf"
++ if `grep -q "wrapper\.user=" "/etc/neo4j/neo4j-wrapper.conf"` ; then
++ sed -i -e "s/^.*wrapper\.user=.*$/wrapper\.user=$1/" "/etc/neo4j/neo4j-wrapper.conf"
+ else
+- echo "wrapper.user=$1" >> "$NEO4J_INSTANCE/conf/neo4j-wrapper.conf"
++ echo "wrapper.user=$1" >> "/etc/neo4j/neo4j-wrapper.conf"
+ fi
+
+- if `grep -q "wrapper\.user\.created=" "$NEO4J_INSTANCE/conf/neo4j-wrapper.conf"` ; then
+- sed -i -e "s/^.*wrapper\.user\.created=.*$/wrapper\.user\.created=${created}/" "$NEO4J_INSTANCE/conf/neo4j-wrapper.conf"
++ if `grep -q "wrapper\.user\.created=" "/etc/neo4j/neo4j-wrapper.conf"` ; then
++ sed -i -e "s/^.*wrapper\.user\.created=.*$/wrapper\.user\.created=${created}/" "/etc/neo4j/neo4j-wrapper.conf"
+ else
+- echo "wrapper.user.created=${created}" >> "$NEO4J_INSTANCE/conf/neo4j-wrapper.conf"
++ echo "wrapper.user.created=${created}" >> "/etc/neo4j/neo4j-wrapper.conf"
+ fi
+ }
+
+@@ -363,7 +362,7 @@
+ fi
+ 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"
+ fi
+ fi
+ elif [[ $DIST_OS -eq "macosx" ]] ; then