summarylogtreecommitdiffstats
path: root/conf.patch
blob: 71b764ec52e69faff5ff6dee48f8510071bb8988 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
diff -Naur neo4j-community-2.0.0.orig/conf/logging.properties neo4j-community-2.0.0/conf/logging.properties
--- neo4j-community-2.0.0.orig/conf/logging.properties	2013-12-08 13:51:51.000000000 -0200
+++ neo4j-community-2.0.0/conf/logging.properties	2013-12-19 14:01:10.531945416 -0200
@@ -51,7 +51,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/neo4j.%u.%g.log
 
 # Specifies whether the FileHandler should append onto any existing files
 # (defaults to false):
diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-http-logging.xml neo4j-community-2.0.0/conf/neo4j-http-logging.xml
--- neo4j-community-2.0.0.orig/conf/neo4j-http-logging.xml	2013-12-08 13:51:51.000000000 -0200
+++ neo4j-community-2.0.0/conf/neo4j-http-logging.xml	2013-12-19 14:01:55.355564433 -0200
@@ -21,9 +21,9 @@
 -->
 <configuration>
   <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>data/log/http.log</file>
+    <file>/var/log/neo4j/http.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>data/log/http.%d{yyyy-MM-dd_HH}.log</fileNamePattern>
+      <fileNamePattern>/var/log/neo4j/http.%d{yyyy-MM-dd_HH}.log</fileNamePattern>
       <maxHistory>30</maxHistory>
     </rollingPolicy>
 
diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-server.properties neo4j-community-2.0.0/conf/neo4j-server.properties
--- neo4j-community-2.0.0.orig/conf/neo4j-server.properties	2013-12-08 13:51:51.000000000 -0200
+++ neo4j-community-2.0.0/conf/neo4j-server.properties	2013-12-19 14:04:32.996949681 -0200
@@ -8,7 +8,7 @@
 #***************************************************************
 
 # location of the database directory 
-org.neo4j.server.database.location=data/graph.db
+org.neo4j.server.database.location=/var/lib/neo4j/data/graph.db
 
 # Let the webserver only listen on the specified IP. Default is localhost (only
 # accept local connections). Uncomment to allow any connection. Please see the
@@ -33,14 +33,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/lib/neo4j/data/keystore
 
 #*****************************************************************
 # Administration client configuration
@@ -50,7 +50,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/lib/neo4j/data/rrd
 
 # REST endpoint for the data API
 # Note the / in the end is mandatory
@@ -60,7 +60,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
 
 # The console services to be enabled
 org.neo4j.server.manage.console_engines=shell
@@ -87,5 +87,5 @@
 # archived. Note: changing the rollover and retention policy is sensible, but
 # changing the output format is less so, since it is configured to use the
 # ubiquitous common log format
-org.neo4j.server.http.log.config=conf/neo4j-http-logging.xml
+org.neo4j.server.http.log.config=/etc/neo4j/neo4j-http-logging.xml
 
diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-wrapper.conf neo4j-community-2.0.0/conf/neo4j-wrapper.conf
--- neo4j-community-2.0.0.orig/conf/neo4j-wrapper.conf	2013-12-08 13:51:51.000000000 -0200
+++ neo4j-community-2.0.0/conf/neo4j-wrapper.conf	2013-12-20 14:26:22.470030601 -0200
@@ -1,6 +1,6 @@
-wrapper.java.additional=-Dorg.neo4j.server.properties=conf/neo4j-server.properties
-wrapper.java.additional=-Djava.util.logging.config.file=conf/logging.properties
-wrapper.java.additional=-Dlog4j.configuration=file:conf/log4j.properties
+wrapper.java.additional=-Dorg.neo4j.server.properties=/etc/neo4j/neo4j-server.properties
+wrapper.java.additional=-Djava.util.logging.config.file=/etc/neo4j/logging.properties
+wrapper.java.additional=-Dlog4j.configuration=file:/etc/neo4j/log4j.properties
 
 #********************************************************************
 # JVM Parameters
@@ -10,7 +10,7 @@
 wrapper.java.additional=-XX:+CMSClassUnloadingEnabled
 
 # Uncomment the following lines to enable garbage collection logging
-#wrapper.java.additional=-Xloggc:data/log/neo4j-gc.log
+#wrapper.java.additional=-Xloggc:/var/log/neo4j/neo4j-gc.log
 #wrapper.java.additional=-XX:+PrintGCDetails
 #wrapper.java.additional=-XX:+PrintGCDateStamps
 #wrapper.java.additional=-XX:+PrintGCApplicationStoppedTime
@@ -26,8 +26,8 @@
 # Wrapper settings
 #********************************************************************
 # Override default pidfile and lockfile 
-#wrapper.pidfile=../data/neo4j-server.pid
-#wrapper.lockfile=../data/neo4j-server.lck
+#wrapper.pidfile=/var/lib/neo4j/data/neo4j-server.pid
+#wrapper.lockfile=/var/lib/neo4j/data/neo4j-server.lck
 
 #********************************************************************
 # Wrapper Windows NT/2000/XP Service Properties
@@ -42,5 +42,5 @@
 
 # User account to be used for linux installs. Will default to current
 # user if not set.
-wrapper.user=
+wrapper.user=neo4j