From ddf14c0969b5f1ff6b1f426a3992b48f22aabeb4 Mon Sep 17 00:00:00 2001
From: Leonardo Martins <leonardo@venidera.com>
Date: Thu, 26 Apr 2012 15:01:56 -0300
Subject: Moved log files to /var/log

---
 .../files/neo4j-community-1.7-logging_properties.patch       | 11 +++++++++++
 dev-db/neo4j-community/files/neo4j-community-1.7-neo4j.patch |  6 +++---
 dev-db/neo4j-community/files/neo4j-community-1.7-utils.patch | 12 ++++++------
 .../files/neo4j-community-1.7-wrapper_configuration.patch    |  9 +++++++--
 4 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 dev-db/neo4j-community/files/neo4j-community-1.7-logging_properties.patch

diff --git a/dev-db/neo4j-community/files/neo4j-community-1.7-logging_properties.patch b/dev-db/neo4j-community/files/neo4j-community-1.7-logging_properties.patch
new file mode 100644
index 0000000..ee1bd49
--- /dev/null
+++ b/dev-db/neo4j-community/files/neo4j-community-1.7-logging_properties.patch
@@ -0,0 +1,11 @@
+--- conf/logging.properties.orig	2012-04-26 14:57:04.000000000 -0300
++++ conf/logging.properties	2012-04-26 14:58:33.000000000 -0300
+@@ -53,7 +53,7 @@
+ #    "%g" the generation number to distinguish rotated logs
+ #    "%u" a unique number to resolve conflicts
+ #    "%%" translates to a single percent sign "%"
+-java.util.logging.FileHandler.pattern=data/log/neo4j.%u.%g.log
++java.util.logging.FileHandler.pattern=/var/log/neo4j.log.%u.%g
+ 
+ # Specifies whether the FileHandler should append onto any existing files (defaults to false).
+ java.util.logging.FileHandler.append=true
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 63c9fab..836d8bf 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 15:26:38.000000000 -0300
++++ bin/neo4j	2012-04-26 14:50:22.000000000 -0300
 @@ -51,26 +51,25 @@
  function parseConfig {
    if [ ${BASH_VERSINFO[0]} -eq 3 ] ; then
@@ -77,7 +77,7 @@
          -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 >> \"/var/db/neo4j/log/console.log\" 2>&1 & echo \$! > \"$PID_FILE\" "
++        org.neo4j.server.Bootstrapper >> \"/var/log/neo4j.log\" 2>&1 & echo \$! > \"$PID_FILE\" "
      else
        checkwriteaccess
        echo "WARNING: not changing user"
@@ -89,7 +89,7 @@
 +        -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 >> "/var/db/neo4j/log/console.log" 2>&1 & echo $! > "${PID_FILE}"
++        org.neo4j.server.Bootstrapper >> "/var/log/neo4j.log" 2>&1 & echo $! > "${PID_FILE}"
      fi
      STARTED_PID=$( cat "$PID_FILE" )
  
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
index 92d9340..713c3af 100644
--- a/dev-db/neo4j-community/files/neo4j-community-1.7-utils.patch
+++ b/dev-db/neo4j-community/files/neo4j-community-1.7-utils.patch
@@ -1,5 +1,5 @@
 --- bin/utils.orig	2012-04-24 15:37:50.000000000 -0300
-+++ bin/utils	2012-04-24 15:29:25.000000000 -0300
++++ bin/utils	2012-04-26 14:56:15.000000000 -0300
 @@ -121,8 +121,8 @@
  
  checkwriteaccess() {
@@ -19,13 +19,13 @@
 -    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
++    # Create /var/log/neo4j.log if missing, change owner if created.
++    if [ ! -e /var/log/neo4j.log ]; then
++      echo "/var/log/neo4j.log was missing, recreating..."
++      touch /var/log/neo4j.log
        if [ $UID == 0 ] ; then
 -        chown $NEO4J_USER "$NEO4J_HOME"/data/log
-+        chown $NEO4J_USER /var/db/neo4j/log
++        chown $NEO4J_USER /var/log/neo4j.log
        fi
      fi
  }
diff --git a/dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_configuration.patch b/dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_configuration.patch
index 891521c..487996a 100644
--- a/dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_configuration.patch
+++ b/dev-db/neo4j-community/files/neo4j-community-1.7-wrapper_configuration.patch
@@ -1,6 +1,6 @@
 --- conf/neo4j-wrapper.conf.orig	2012-04-24 09:08:14.000000000 -0300
-+++ conf/neo4j-wrapper.conf	2012-04-24 15:43:09.000000000 -0300
-@@ -2,8 +2,8 @@
++++ conf/neo4j-wrapper.conf	2012-04-26 15:00:29.000000000 -0300
+@@ -2,12 +2,12 @@
  # JVM Parameters
  #********************************************************************
   
@@ -11,6 +11,11 @@
  wrapper.java.additional.3=-Dfile.encoding=UTF-8
  
  # Uncomment the following line to enable garbage collection logging
+-#wrapper.java.additional.4=-Xloggc:data/log/neo4j-gc.log
++#wrapper.java.additional.4=-Xloggc:/var/log/neo4j-gc.log
+ 
+ # Initial Java Heap Size (in MB)
+ #wrapper.java.initmemory=16
 @@ -19,8 +19,8 @@
  # Wrapper settings
  #********************************************************************
-- 
cgit v1.2.3