diff options
author | Marcel Campello Ferreira | 2016-06-20 05:50:06 -0300 |
---|---|---|
committer | Marcel Campello Ferreira | 2016-06-20 05:50:06 -0300 |
commit | 3a60db3f9f87c323ad4ecefec6a9e0f49f3ca1c7 (patch) | |
tree | 2cd249f8e5c3622455012646f1fbde11f67db7dd | |
parent | 99885605139a974b5459195c68d472031a9cecf4 (diff) | |
download | aur-3a60db3f9f87c323ad4ecefec6a9e0f49f3ca1c7.tar.gz |
Version 3.0.3-1.
-rw-r--r-- | .SRCINFO | 25 | ||||
-rw-r--r-- | PKGBUILD | 110 | ||||
-rw-r--r-- | bin.patch | 149 | ||||
-rw-r--r-- | conf.patch | 134 | ||||
-rw-r--r-- | neo4j-tmpfile.conf | 2 | ||||
-rw-r--r-- | neo4j.service | 4 |
6 files changed, 101 insertions, 323 deletions
@@ -1,33 +1,30 @@ pkgbase = neo4j-community pkgdesc = A fully transactional graph database implemented in Java - pkgver = 2.3.3 + pkgver = 3.0.3 pkgrel = 1 url = http://neo4j.org/ install = neo4j.install arch = any - license = GPL + license = custom makedepends = patch depends = bash - depends = lsof - depends = java-runtime-headless + depends = java-runtime-headless>=8 conflicts = neo4j-enterprise options = !strip - backup = etc/neo4j/neo4j-http-logging.xml - backup = etc/neo4j/neo4j-server.properties backup = etc/neo4j/neo4j-wrapper.conf - backup = etc/neo4j/neo4j.properties - source = http://dist.neo4j.org/neo4j-community-2.3.3-unix.tar.gz - source = bin.patch + backup = etc/neo4j/neo4j.conf + source = http://dist.neo4j.org/neo4j-community-3.0.3-unix.tar.gz source = conf.patch + source = bin.patch source = neo4j.install source = neo4j.service source = neo4j-tmpfile.conf - sha256sums = 01559c55055516a42ee2dd100137b6b55d63f02959a3c6c6db7a152e045828d9 - sha256sums = a96f364ff3c3bf62e8a007364a87daef4a0515bce432a54899f5b97f0ff9c7d4 - sha256sums = 4717f8765d2a6912120077337402ac8dfa3a793ee723ea41080c3412457d78e0 + sha256sums = 20cd65c84a6e5345f17bb03c145190f74e58ec2754c2e515a64b317e34dae2ce + sha256sums = 7a8b8ddf3753be94562e8f5f9a9db021a1000548940a65009201924357a1581c + sha256sums = 0967d580b7847800b942138e685e80ba423ae3170ff1fc059f1cef0edd4ce5d8 sha256sums = 3c4f3daea1623a5bc4c56d87ff4d76ff4737722eb730e2f9b65a0980bf3633a3 - sha256sums = ee451a5b4ac3f733ab725bb3babeefc4d852115fe24ee29a3060922716212ad7 - sha256sums = e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d + sha256sums = cf3148bd65ddc06f5ca8cf2ad37013d2e1aa561c5759e4b295f361465e603928 + sha256sums = e1311352e05b1e698599b91883141b938ceb418abd7e6bc11cc964854f0a21e1 pkgname = neo4j-community @@ -1,18 +1,16 @@ # Maintainer: Marcel Campello Ferreira <marcel.campello.ferreira@gmail.com> pkgname=neo4j-community -pkgver=2.3.3 +pkgver=3.0.3 pkgrel=1 -pkgdesc="A fully transactional graph database implemented in Java" +pkgdesc='A fully transactional graph database implemented in Java' arch=(any) -url="http://neo4j.org/" -license=(GPL) +url=http://neo4j.org/ +license=(custom) makedepends=(patch) -depends=(bash lsof java-runtime-headless) +depends=(bash 'java-runtime-headless>=8') conflicts=(neo4j-enterprise) -backup=(etc/neo4j/neo4j-http-logging.xml - etc/neo4j/neo4j-server.properties - etc/neo4j/neo4j-wrapper.conf - etc/neo4j/neo4j.properties) +backup=(etc/neo4j/neo4j-wrapper.conf + etc/neo4j/neo4j.conf) options=(!strip) install=neo4j.install source=(http://dist.neo4j.org/neo4j-community-$pkgver-unix.tar.gz @@ -21,76 +19,72 @@ source=(http://dist.neo4j.org/neo4j-community-$pkgver-unix.tar.gz neo4j.install neo4j.service neo4j-tmpfile.conf) -sha256sums=('01559c55055516a42ee2dd100137b6b55d63f02959a3c6c6db7a152e045828d9' - 'a96f364ff3c3bf62e8a007364a87daef4a0515bce432a54899f5b97f0ff9c7d4' - '4717f8765d2a6912120077337402ac8dfa3a793ee723ea41080c3412457d78e0' +sha256sums=('20cd65c84a6e5345f17bb03c145190f74e58ec2754c2e515a64b317e34dae2ce' + '0967d580b7847800b942138e685e80ba423ae3170ff1fc059f1cef0edd4ce5d8' + '7a8b8ddf3753be94562e8f5f9a9db021a1000548940a65009201924357a1581c' '3c4f3daea1623a5bc4c56d87ff4d76ff4737722eb730e2f9b65a0980bf3633a3' - 'ee451a5b4ac3f733ab725bb3babeefc4d852115fe24ee29a3060922716212ad7' - 'e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d') + 'cf3148bd65ddc06f5ca8cf2ad37013d2e1aa561c5759e4b295f361465e603928' + 'e1311352e05b1e698599b91883141b938ceb418abd7e6bc11cc964854f0a21e1') prepare() { cd $srcdir/neo4j-community-$pkgver - - rm bin/neo4j-installer - rm -rf bin/Neo4j-Management - rm -rf system/resources - - # Adjust configuration to match new directory structure - patch -Np1 -i ../conf.patch patch -Np1 -i ../bin.patch + patch -Np1 -i ../conf.patch } package() { - NEO4J_HOME=usr/share/java/neo4j - NEO4J_SHARE=usr/share/neo4j - NEO4J_CONFIG=etc/neo4j - NEO4J_INSTANCE=var/lib/neo4j - NEO4J_LOG=var/log/neo4j - NEO4J_RUNDIR=run/neo4j - NEO4J_PIDFILE=${NEO4J_RUNDIR}/neo4j-service.pid - cd $srcdir/neo4j-community-$pkgver # Config files - install -dm755 $pkgdir/$NEO4J_CONFIG - cp -r conf/* $pkgdir/$NEO4J_CONFIG + CONFIG_DIR=etc/neo4j + install -dm755 $pkgdir/$CONFIG_DIR + [[ $(ls -A conf/* 2>/dev/null) ]] && cp -r conf/* $pkgdir/$CONFIG_DIR - # Copy JARs in lib, system and plugins - install -dm755 $pkgdir/$NEO4J_HOME - cp -r lib/* $pkgdir/$NEO4J_HOME + # Data, import and log files + DATA_DIR=var/lib/neo4j/data + install -dm755 $pkgdir/$DATA_DIR + [[ $(ls -A data/* 2>/dev/null) ]] && cp -r data/* $pkgdir/$DATA_DIR - install -dm755 $pkgdir/$NEO4J_HOME/system - cp -r system/* $pkgdir/$NEO4J_HOME/system - - install -dm755 $pkgdir/$NEO4J_HOME/plugins - cp -r plugins/* $pkgdir/$NEO4J_HOME/plugins + IMPORT_DIR=var/lib/neo4j/import + install -dm755 $pkgdir/$IMPORT_DIR + [[ $(ls -A import/* 2>/dev/null) ]] && cp -r import/* $pkgdir/$IMPORT_DIR + + LOG_DIR=var/log/neo4j + install -dm755 $pkgdir/$LOG_DIR + [[ $(ls -A logs/* 2>/dev/null) ]] && cp -r logs/* $pkgdir/$LOG_DIR + + # Copy JARs in lib and plugins + LIB_DIR=usr/share/java/neo4j + install -dm755 $pkgdir/$LIB_DIR + [[ $(ls -A lib/* 2>/dev/null) ]] && cp -r lib/* $pkgdir/$LIB_DIR + + PLUGINS_DIR=usr/share/java/neo4j/plugins + install -dm755 $pkgdir/$PLUGINS_DIR + [[ $(ls -A plugins/* 2>/dev/null) ]] && cp -r plugins/* $pkgdir/$PLUGINS_DIR # Executable files - install -dm755 $pkgdir/$NEO4J_SHARE/bin - cp -r bin/* $pkgdir/$NEO4J_SHARE/bin - - install -dm755 $pkgdir/usr/bin - ln -s /$NEO4J_SHARE/bin/neo4j $pkgdir/usr/bin/neo4j - ln -s /$NEO4J_SHARE/bin/neo4j-import $pkgdir/usr/bin/neo4j-import - ln -s /$NEO4J_SHARE/bin/neo4j-shell $pkgdir/usr/bin/neo4j-shell - - # Data and log files - install -dm755 $pkgdir/$NEO4J_LOG - cp -r data/log/* $pkgdir/$NEO4J_LOG - - install -dm755 $pkgdir/$NEO4J_INSTANCE/data - rm -rf data/log - cp -r data/* $pkgdir/$NEO4J_INSTANCE/data + BIN_DIR=usr/share/neo4j/bin + install -dm755 $pkgdir/$BIN_DIR + [[ $(ls -A bin/* 2>/dev/null) ]] && cp -r bin/* $pkgdir/$BIN_DIR + + SYSTEM_BIN_DIR=usr/bin + install -dm755 $pkgdir/$SYSTEM_BIN_DIR + for file in $(find $pkgdir/$BIN_DIR -maxdepth 1 -type f); do + b_file=$(basename $file) + ln -s /$BIN_DIR/$b_file $pkgdir/$SYSTEM_BIN_DIR/$b_file; + done # Documentation - install -dm755 $pkgdir/usr/share/doc/neo4j - cp CHANGES.txt README.txt UPGRADE.txt $pkgdir/usr/share/doc/neo4j + DOC_DIR=usr/share/doc/neo4j + install -dm755 $pkgdir/$DOC_DIR + cp README.txt UPGRADE.txt $pkgdir/$DOC_DIR # License files - install -dm755 $pkgdir/usr/share/licenses/neo4j - cp LICENSE.txt LICENSES.txt NOTICE.txt $pkgdir/usr/share/licenses/neo4j + LICENSES_DIR=usr/share/licenses/neo4j + install -dm755 $pkgdir/$LICENSES_DIR + cp LICENSE.txt LICENSES.txt NOTICE.txt $pkgdir/$LICENSES_DIR # Service definition files cd $srcdir diff --git a/bin.patch b/bin.patch index 03437bc4fdb6..1b0ac11dcedb 100644 --- a/bin.patch +++ b/bin.patch @@ -1,128 +1,21 @@ -diff -Naur neo4j-community-2.3.3-orig/bin/neo4j neo4j-community-2.3.3-mod/bin/neo4j ---- neo4j-community-2.3.3-orig/bin/neo4j 2016-01-12 21:01:31.000000000 -0200 -+++ neo4j-community-2.3.3-mod/bin/neo4j 2016-01-26 10:38:34.784729340 -0200 -@@ -33,24 +33,13 @@ - LAUNCHD_NAME="org.neo4j.server" - - function findBaseDirAndCdThere { --# This seems to not be safe to run at any time. If that --# is the case, it should be fixed to be so, if possible. -- SCRIPT=$0 -- -- cd "`dirname "$SCRIPT"`" -- SCRIPT=`basename "$SCRIPT"` -- -- while [ -L "$SCRIPT" ] -- do -- SCRIPT=$( readlink "$SCRIPT" ) -- cd "$(dirname "$SCRIPT")" -- SCRIPT=`basename "$SCRIPT"` -- done -- NEO4J_HOME=`cd $( dirname "$SCRIPT" )/.. && dirs -l +0` -- NEO4J_INSTANCE=$NEO4J_HOME -- [ -n "$NEO4J_CONFIG" ] || NEO4J_CONFIG=$NEO4J_HOME/conf -- [ -n "$NEO4J_LOG" ] || NEO4J_LOG=$NEO4J_HOME/data/log -- [ -n "$NEO4J_PIDFILE" ] || NEO4J_PIDFILE=$NEO4J_HOME/data/neo4j-service.pid -+ NEO4J_HOME=/usr/share/java/neo4j -+ NEO4J_SHARE=/usr/share/neo4j -+ NEO4J_CONFIG=/etc/neo4j -+ NEO4J_INSTANCE=/var/lib/neo4j -+ NEO4J_LOG=/var/log/neo4j -+ NEO4J_RUNDIR=/run/neo4j -+ NEO4J_PIDFILE=${NEO4J_RUNDIR}/neo4j-service.pid - - cd "$NEO4J_HOME" - } -@@ -68,7 +57,7 @@ - } - - findBaseDirAndCdThere --source bin/utils -+source ${NEO4J_SHARE}/bin/utils - parseConfig - - JAVA_OPTS="-server -XX:+DisableExplicitGC ${wrapper_java_additional}" -@@ -91,7 +80,7 @@ - # Username to propose for neo4j user, can be overridden by -u USERNAME option - DEFAULT_USER='neo4j' - --SCRIPT_NAME="${NEO4J_HOME}/bin/neo4j" -+SCRIPT_NAME="${NEO4J_SHARE}/bin/neo4j" - SERVICE_NAME=${wrapper_ntservice_name:=neo4j-service} - LAUNCHD_DIR=~/Library/LaunchAgents/ - -@@ -100,7 +89,7 @@ - PID_FILE=${NEO4J_PIDFILE} - buildclasspath() { - # confirm library jars -- LIBDIR="$NEO4J_HOME"/lib -+ LIBDIR="$NEO4J_HOME" - if [ ! -e "$LIBDIR" ] ; then - echo "Error: missing Neo4j Library, expected at $LIBDIR" - exit 1 -diff -Naur neo4j-community-2.3.3-orig/bin/neo4j-import neo4j-community-2.3.3-mod/bin/neo4j-import ---- neo4j-community-2.3.3-orig/bin/neo4j-import 2016-01-12 21:01:31.000000000 -0200 -+++ neo4j-community-2.3.3-mod/bin/neo4j-import 2016-01-26 10:38:34.784729340 -0200 -@@ -21,19 +21,7 @@ - #Remember where we started from so that working dir is set correctly - RUN_FROM=`pwd` - --SCRIPT_LOCATION="$0" -- --cd "`dirname "$SCRIPT_LOCATION"`" --SCRIPT_LOCATION=`basename "$SCRIPT_LOCATION"` -- --while [ -L "$SCRIPT_LOCATION" ] --do -- SCRIPT_LOCATION=$( readlink $SCRIPT_LOCATION ) -- cd "`dirname "$SCRIPT_LOCATION"`" -- SCRIPT_LOCATION="`basename "$SCRIPT_LOCATION"`" --done -- --BASEDIR=`cd "$( dirname $SCRIPT_LOCATION )"/.. && dirs -l +0` -+BASEDIR=/usr/share/java/neo4j - - # OS specific support. $var _must_ be set to either true or false. - cygwin=false; -@@ -86,7 +74,7 @@ - - if [ -z "$REPO" ] - then -- REPO="$BASEDIR"/lib -+ REPO="$BASEDIR" - fi - - LIBRARY_JARS="" -diff -Naur neo4j-community-2.3.3-orig/bin/neo4j-shell neo4j-community-2.3.3-mod/bin/neo4j-shell ---- neo4j-community-2.3.3-orig/bin/neo4j-shell 2016-01-12 21:01:31.000000000 -0200 -+++ neo4j-community-2.3.3-mod/bin/neo4j-shell 2016-01-26 10:38:34.784729340 -0200 -@@ -21,19 +21,7 @@ - #Remember where we started from so that working dir is set correctly - RUN_FROM=`pwd` - --SHELL_SCRIPT="$0" -- --cd "`dirname "$SHELL_SCRIPT"`" --SHELL_SCRIPT=`basename "$SHELL_SCRIPT"` -- --while [ -L "$SHELL_SCRIPT" ] --do -- SHELL_SCRIPT=$( readlink $SHELL_SCRIPT ) -- cd "`dirname "$SHELL_SCRIPT"`" -- SHELL_SCRIPT="`basename "$SHELL_SCRIPT"`" --done -- --BASEDIR=`cd "$( dirname $SHELL_SCRIPT )"/.. && dirs -l +0` -+BASEDIR=/usr/share/java/neo4j - - # OS specific support. $var _must_ be set to either true or false. - cygwin=false; -@@ -86,7 +74,7 @@ - - if [ -z "$REPO" ] - then -- REPO="$BASEDIR"/lib -+ REPO="$BASEDIR" - fi - - LIBRARY_JARS="" +diff -au0r neo4j-community-3.0.3-orig/bin/neo4j-admin neo4j-community-3.0.3-mod/bin/neo4j-admin +--- neo4j-community-3.0.3-orig/bin/neo4j-admin 2016-06-10 00:01:59.000000000 -0300 ++++ neo4j-community-3.0.3-mod/bin/neo4j-admin 2016-06-20 03:29:19.203468569 -0300 +@@ -21,0 +22,3 @@ ++NEO4J_CONF=/etc/neo4j ++NEO4J_HOME=/usr/share/neo4j ++ +diff -au0r neo4j-community-3.0.3-orig/bin/neo4j-import neo4j-community-3.0.3-mod/bin/neo4j-import +--- neo4j-community-3.0.3-orig/bin/neo4j-import 2016-06-10 00:01:59.000000000 -0300 ++++ neo4j-community-3.0.3-mod/bin/neo4j-import 2016-06-20 03:29:19.203468569 -0300 +@@ -23,0 +24,3 @@ ++NEO4J_CONF=/etc/neo4j ++NEO4J_HOME=/usr/share/neo4j ++ +diff -au0r neo4j-community-3.0.3-orig/bin/neo4j-shell neo4j-community-3.0.3-mod/bin/neo4j-shell +--- neo4j-community-3.0.3-orig/bin/neo4j-shell 2016-06-10 00:01:59.000000000 -0300 ++++ neo4j-community-3.0.3-mod/bin/neo4j-shell 2016-06-20 03:29:19.203468569 -0300 +@@ -23,0 +24,3 @@ ++NEO4J_CONF=/etc/neo4j ++NEO4J_HOME=/usr/share/neo4j ++ diff --git a/conf.patch b/conf.patch index 8ea79ebebf4b..2c051a2f4914 100644 --- a/conf.patch +++ b/conf.patch @@ -1,121 +1,13 @@ -diff -Naur neo4j-community-2.3.3-orig/conf/neo4j-http-logging.xml neo4j-community-2.3.3-mod/conf/neo4j-http-logging.xml ---- neo4j-community-2.3.3-orig/conf/neo4j-http-logging.xml 2016-01-12 21:01:31.000000000 -0200 -+++ neo4j-community-2.3.3-mod/conf/neo4j-http-logging.xml 2016-01-26 10:38:26.734706133 -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}.log</fileNamePattern> -+ <fileNamePattern>/var/log/neo4j/http.%d{yyyy-MM-dd}.log</fileNamePattern> - <maxHistory>7</maxHistory> - </rollingPolicy> - -diff -Naur neo4j-community-2.3.3-orig/conf/neo4j.properties neo4j-community-2.3.3-mod/conf/neo4j.properties ---- neo4j-community-2.3.3-orig/conf/neo4j.properties 2016-01-12 21:01:31.000000000 -0200 -+++ neo4j-community-2.3.3-mod/conf/neo4j.properties 2016-01-26 10:38:26.734706133 -0200 -@@ -24,8 +24,8 @@ - # Set the root directory for use with file URLs (`file:///`) in LOAD CSV. - # If enabled, file URLs will refer to locations inside the `data/import` - # directory. I.e. `file:///movies/actors.csv` will load from the file --# `data/import/movies/actors.csv`. --#dbms.security.load_csv_file_url_root=data/import -+# `/var/lib/neo4j/data/import/movies/actors.csv`. -+#dbms.security.load_csv_file_url_root=/var/lib/neo4j/data/import - - # Keep logical logs, helps debugging but uses more disk space, enabled for - # legacy reasons To limit space needed to store historical logs use values such -diff -Naur neo4j-community-2.3.3-orig/conf/neo4j-server.properties neo4j-community-2.3.3-mod/conf/neo4j-server.properties ---- neo4j-community-2.3.3-orig/conf/neo4j-server.properties 2016-01-12 21:01:31.000000000 -0200 -+++ neo4j-community-2.3.3-mod/conf/neo4j-server.properties 2016-01-26 10:38:26.734706133 -0200 -@@ -10,10 +10,10 @@ - #*************************************************************** - - # location of the database directory --org.neo4j.server.database.location=data/graph.db -+org.neo4j.server.database.location=/var/lib/neo4j/data/graph.db - - # 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 - - # Let the webserver only listen on the specified IP. Default is localhost (only - # accept local connections). Uncomment to allow any connection. Please see the -@@ -23,6 +23,9 @@ - # Require (or disable the requirement of) auth to access Neo4j - dbms.security.auth_enabled=true - -+# User auth data directory -+dbms.security.auth_store.location=/var/lib/neo4j/data/dbms/auth -+ - # - # HTTP Connector - # -@@ -41,14 +44,14 @@ - org.neo4j.server.webserver.https.port=7473 - - # Certificate location (auto generated if the file does not exist) --dbms.security.tls_certificate_file=conf/ssl/snakeoil.cert -+dbms.security.tls_certificate_file=/etc/neo4j/ssl/snakeoil.cert - - # Private key location (auto generated if the file does not exist) --dbms.security.tls_key_file=conf/ssl/snakeoil.key -+dbms.security.tls_key_file=/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 - - # Comma separated list of JAX-RS packages containing JAX-RS resources, one - # package name for each mountpoint. The listed package names will be loaded -@@ -71,7 +74,7 @@ - # 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 - - - #***************************************************************** -@@ -82,5 +85,5 @@ - # - 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 - -diff -Naur neo4j-community-2.3.3-orig/conf/neo4j-wrapper.conf neo4j-community-2.3.3-mod/conf/neo4j-wrapper.conf ---- neo4j-community-2.3.3-orig/conf/neo4j-wrapper.conf 2016-01-12 21:01:31.000000000 -0200 -+++ neo4j-community-2.3.3-mod/conf/neo4j-wrapper.conf 2016-01-26 10:38:26.734706133 -0200 -@@ -2,8 +2,8 @@ - # Property file references - #******************************************************************** - --wrapper.java.additional=-Dorg.neo4j.server.properties=conf/neo4j-server.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=-Dlog4j.configuration=file:/etc/neo4j/log4j.properties - - #******************************************************************** - # JVM Parameters -@@ -32,7 +32,7 @@ - # Wrapper settings - #******************************************************************** - # path is relative to the bin dir --wrapper.pidfile=../data/neo4j-server.pid -+wrapper.pidfile=/run/neo4j/neo4j-server.pid - - #******************************************************************** - # Wrapper Windows NT/2000/XP Service Properties -@@ -47,7 +47,7 @@ - - # User account to be used for linux installs. Will default to current - # user if not set. --wrapper.user= -+wrapper.user=neo4j - - #******************************************************************** - # Other Neo4j system properties +diff -au0r neo4j-community-3.0.3-orig/conf/neo4j.conf neo4j-community-3.0.3-mod/conf/neo4j.conf +--- neo4j-community-3.0.3-orig/conf/neo4j.conf 2016-06-10 00:01:59.000000000 -0300 ++++ neo4j-community-3.0.3-mod/conf/neo4j.conf 2016-06-20 03:29:26.096744910 -0300 +@@ -9,3 +9,6 @@ +-#dbms.directories.data=data +-#dbms.directories.plugins=plugins +-#dbms.directories.certificates=certificates ++dbms.directories.data=/var/lib/neo4j/data ++dbms.directories.plugins=/usr/share/java/neo4j/plugins ++dbms.directories.lib=/usr/share/java/neo4j ++dbms.directories.logs=/var/log/neo4j ++dbms.directories.run=/run/neo4j ++dbms.directories.certificates=/var/lib/neo4j/certificates diff --git a/neo4j-tmpfile.conf b/neo4j-tmpfile.conf index 2730682b2d70..6553f9e1d47d 100644 --- a/neo4j-tmpfile.conf +++ b/neo4j-tmpfile.conf @@ -1 +1 @@ -d /run/neo4j 0755 neo4j neo4j -
\ No newline at end of file +d /run/neo4j 0755 neo4j neo4j - diff --git a/neo4j.service b/neo4j.service index d14fbb473ed7..37a6f9aeb69a 100644 --- a/neo4j.service +++ b/neo4j.service @@ -4,9 +4,11 @@ Description=Neo4j [Service] User=neo4j Type=forking +Environment=NEO4J_CONF=/etc/neo4j +Environment=NEO4J_HOME=/usr/share/neo4j ExecStart=/usr/bin/neo4j start ExecStop=/usr/bin/neo4j stop -PIDFile=/run/neo4j/neo4j-service.pid +PIDFile=/run/neo4j/neo4j.pid LimitNOFILE=40000 [Install] |