diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | bin.patch | 20 | ||||
| -rw-r--r-- | conf.patch | 24 | ||||
| -rw-r--r-- | neo4j.install | 33 | ||||
| -rw-r--r-- | neo4j.service | 1 |
6 files changed, 56 insertions, 52 deletions
@@ -1,7 +1,7 @@ pkgbase = neo4j pkgdesc = A fully transactional graph database implemented in Java - pkgver = 2.0.3 - pkgrel = 2 + pkgver = 2.1.1 + pkgrel = 1 url = http://neo4j.org/ install = neo4j.install arch = any @@ -17,17 +17,17 @@ pkgbase = neo4j 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.0.3-unix.tar.gz + source = http://dist.neo4j.org/neo4j-community-2.1.1-unix.tar.gz source = bin.patch source = conf.patch source = neo4j.install source = neo4j.service source = neo4j-tmpfile.conf - sha256sums = f7698c0f479bdffc8713d299314a322305cfa094859a88a99b50e8cf3df099e9 - sha256sums = 870d0fe93a07053df8edcee32c5638414336116a2a26531fa689e849032fdf9e - sha256sums = 47f7648c0d609d363ae8e4ad5317a7f37f7625c4ac05a356d2d41a9bfbde495a - sha256sums = b86e71e80ad7c2e10a095dfd42296c117ffafa10ee1cc923e1072f6d64ac9dfa - sha256sums = 9b6438b75b88a89e89751996942c453fb60c6e8b0bd5aa432bbefddc753362d8 + sha256sums = f7775e8fae1f8f1ab8065de6606acca9c983a6a30afc17b4ddc78cdecd699c48 + sha256sums = 582e19951d2f99342ae87c902d157ae1bd9e1ee5bf0daebedaf269c0642dfd06 + sha256sums = 447690479e505b870150e5b68d62ec512b5a38e953dfc21b0391e4d2047b8d0b + sha256sums = 60863d1da348dd07ac7c321c51819596f73bb326cb686b85661e1165daea86e9 + sha256sums = ee451a5b4ac3f733ab725bb3babeefc4d852115fe24ee29a3060922716212ad7 sha256sums = e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d pkgname = neo4j @@ -1,7 +1,7 @@ # Maintainer: Marcel Campello Ferreira <tucho.tijucano@gmail.com> pkgname=neo4j -pkgver=2.0.3 -pkgrel=2 +pkgver=2.1.1 +pkgrel=1 pkgdesc="A fully transactional graph database implemented in Java" arch=(any) url="http://neo4j.org/" @@ -22,11 +22,11 @@ source=(http://dist.neo4j.org/neo4j-community-$pkgver-unix.tar.gz neo4j.install neo4j.service neo4j-tmpfile.conf) -sha256sums=(f7698c0f479bdffc8713d299314a322305cfa094859a88a99b50e8cf3df099e9 - 870d0fe93a07053df8edcee32c5638414336116a2a26531fa689e849032fdf9e - 47f7648c0d609d363ae8e4ad5317a7f37f7625c4ac05a356d2d41a9bfbde495a - b86e71e80ad7c2e10a095dfd42296c117ffafa10ee1cc923e1072f6d64ac9dfa - 9b6438b75b88a89e89751996942c453fb60c6e8b0bd5aa432bbefddc753362d8 +sha256sums=(f7775e8fae1f8f1ab8065de6606acca9c983a6a30afc17b4ddc78cdecd699c48 + 582e19951d2f99342ae87c902d157ae1bd9e1ee5bf0daebedaf269c0642dfd06 + 447690479e505b870150e5b68d62ec512b5a38e953dfc21b0391e4d2047b8d0b + 60863d1da348dd07ac7c321c51819596f73bb326cb686b85661e1165daea86e9 + ee451a5b4ac3f733ab725bb3babeefc4d852115fe24ee29a3060922716212ad7 e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d) prepare() { diff --git a/bin.patch b/bin.patch index 47332bc262f8..d7bf976afe3a 100644 --- a/bin.patch +++ b/bin.patch @@ -1,6 +1,6 @@ -diff -Naur neo4j-community-2.0.1.orig/bin/neo4j neo4j-community-2.0.1/bin/neo4j ---- neo4j-community-2.0.1.orig/bin/neo4j 2014-02-03 12:27:28.000000000 -0200 -+++ neo4j-community-2.0.1/bin/neo4j 2014-02-06 11:19:45.627080264 -0200 +diff -Naur neo4j-community-2.1.1-orig/bin/neo4j neo4j-community-2.1.1-mod/bin/neo4j +--- neo4j-community-2.1.1-orig/bin/neo4j 2014-05-29 13:24:28.000000000 -0300 ++++ neo4j-community-2.1.1-mod/bin/neo4j 2014-06-01 11:21:42.668017211 -0300 @@ -46,10 +46,11 @@ cd "$(dirname "$SCRIPT")" SCRIPT=`basename "$SCRIPT"` @@ -86,9 +86,9 @@ diff -Naur neo4j-community-2.0.1.orig/bin/neo4j neo4j-community-2.0.1/bin/neo4j fi } -diff -Naur neo4j-community-2.0.1.orig/bin/neo4j-shell neo4j-community-2.0.1/bin/neo4j-shell ---- neo4j-community-2.0.1.orig/bin/neo4j-shell 2014-02-03 12:27:28.000000000 -0200 -+++ neo4j-community-2.0.1/bin/neo4j-shell 2014-02-06 11:23:15.362633139 -0200 +diff -Naur neo4j-community-2.1.1-orig/bin/neo4j-shell neo4j-community-2.1.1-mod/bin/neo4j-shell +--- neo4j-community-2.1.1-orig/bin/neo4j-shell 2014-05-29 13:24:28.000000000 -0300 ++++ neo4j-community-2.1.1-mod/bin/neo4j-shell 2014-06-01 11:23:17.293095310 -0300 @@ -86,7 +86,7 @@ if [ -z "$REPO" ] @@ -98,10 +98,10 @@ diff -Naur neo4j-community-2.0.1.orig/bin/neo4j-shell neo4j-community-2.0.1/bin/ fi LIBRARY_JARS="" -diff -Naur neo4j-community-2.0.1.orig/bin/utils neo4j-community-2.0.1/bin/utils ---- neo4j-community-2.0.1.orig/bin/utils 2014-02-03 12:27:28.000000000 -0200 -+++ neo4j-community-2.0.1/bin/utils 2014-02-06 11:28:38.775733143 -0200 -@@ -325,11 +325,11 @@ +diff -Naur neo4j-community-2.1.1-orig/bin/utils neo4j-community-2.1.1-mod/bin/utils +--- neo4j-community-2.1.1-orig/bin/utils 2014-05-29 13:24:28.000000000 -0300 ++++ neo4j-community-2.1.1-mod/bin/utils 2014-06-01 11:24:51.224800589 -0300 +@@ -324,11 +324,11 @@ # in place. checkandrepairenv() { # Create data/log if missing, change owner if created. diff --git a/conf.patch b/conf.patch index 805a17297356..bb861b5db6f3 100644 --- a/conf.patch +++ b/conf.patch @@ -1,6 +1,6 @@ -diff -Naur neo4j-community-2.0.1.orig/conf/logging.properties neo4j-community-2.0.1/conf/logging.properties ---- neo4j-community-2.0.1.orig/conf/logging.properties 2014-02-03 12:27:28.000000000 -0200 -+++ neo4j-community-2.0.1/conf/logging.properties 2014-02-06 14:16:01.912344474 -0200 +diff -Naur neo4j-community-2.1.1-orig/conf/logging.properties neo4j-community-2.1.1-mod/conf/logging.properties +--- neo4j-community-2.1.1-orig/conf/logging.properties 2014-05-29 13:24:27.000000000 -0300 ++++ neo4j-community-2.1.1-mod/conf/logging.properties 2014-06-01 11:29:56.386956419 -0300 @@ -51,7 +51,7 @@ # "%g" the generation number to distinguish rotated logs # "%u" a unique number to resolve conflicts @@ -10,9 +10,9 @@ diff -Naur neo4j-community-2.0.1.orig/conf/logging.properties neo4j-community-2. # Specifies whether the FileHandler should append onto any existing files # (defaults to false): -diff -Naur neo4j-community-2.0.1.orig/conf/neo4j-http-logging.xml neo4j-community-2.0.1/conf/neo4j-http-logging.xml ---- neo4j-community-2.0.1.orig/conf/neo4j-http-logging.xml 2014-02-03 12:27:28.000000000 -0200 -+++ neo4j-community-2.0.1/conf/neo4j-http-logging.xml 2014-02-06 14:17:08.212877706 -0200 +diff -Naur neo4j-community-2.1.1-orig/conf/neo4j-http-logging.xml neo4j-community-2.1.1-mod/conf/neo4j-http-logging.xml +--- neo4j-community-2.1.1-orig/conf/neo4j-http-logging.xml 2014-05-29 13:24:27.000000000 -0300 ++++ neo4j-community-2.1.1-mod/conf/neo4j-http-logging.xml 2014-06-01 11:31:01.271469303 -0300 @@ -21,9 +21,9 @@ --> <configuration> @@ -25,9 +25,9 @@ diff -Naur neo4j-community-2.0.1.orig/conf/neo4j-http-logging.xml neo4j-communit <maxHistory>30</maxHistory> </rollingPolicy> -diff -Naur neo4j-community-2.0.1.orig/conf/neo4j-server.properties neo4j-community-2.0.1/conf/neo4j-server.properties ---- neo4j-community-2.0.1.orig/conf/neo4j-server.properties 2014-02-03 12:27:28.000000000 -0200 -+++ neo4j-community-2.0.1/conf/neo4j-server.properties 2014-02-06 14:20:53.928029987 -0200 +diff -Naur neo4j-community-2.1.1-orig/conf/neo4j-server.properties neo4j-community-2.1.1-mod/conf/neo4j-server.properties +--- neo4j-community-2.1.1-orig/conf/neo4j-server.properties 2014-05-29 13:24:27.000000000 -0300 ++++ neo4j-community-2.1.1-mod/conf/neo4j-server.properties 2014-06-01 11:38:24.366230654 -0300 @@ -8,7 +8,7 @@ #*************************************************************** @@ -80,9 +80,9 @@ diff -Naur neo4j-community-2.0.1.orig/conf/neo4j-server.properties neo4j-communi -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.1.orig/conf/neo4j-wrapper.conf neo4j-community-2.0.1/conf/neo4j-wrapper.conf ---- neo4j-community-2.0.1.orig/conf/neo4j-wrapper.conf 2014-02-03 12:27:28.000000000 -0200 -+++ neo4j-community-2.0.1/conf/neo4j-wrapper.conf 2014-02-06 14:25:22.523534328 -0200 +diff -Naur neo4j-community-2.1.1-orig/conf/neo4j-wrapper.conf neo4j-community-2.1.1-mod/conf/neo4j-wrapper.conf +--- neo4j-community-2.1.1-orig/conf/neo4j-wrapper.conf 2014-05-29 13:24:27.000000000 -0300 ++++ neo4j-community-2.1.1-mod/conf/neo4j-wrapper.conf 2014-06-01 11:38:11.545994632 -0300 @@ -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 diff --git a/neo4j.install b/neo4j.install index a094e1a34578..c5f27165706e 100644 --- a/neo4j.install +++ b/neo4j.install @@ -1,12 +1,3 @@ -assert_user_and_group_exist() { - if ! getent group neo4j >/dev/null; then - groupadd --system neo4j - fi - if ! getent passwd neo4j >/dev/null; then - useradd --system -g neo4j -d /var/lib/neo4j -s /bin/false neo4j - fi -} - post_install() { assert_user_and_group_exist @@ -33,13 +24,27 @@ post_remove() { fi } +assert_user_and_group_exist() { + if ! getent group neo4j >/dev/null; then + groupadd --system neo4j + fi + if ! getent passwd neo4j >/dev/null; then + useradd --system -g neo4j -d /var/lib/neo4j -s /bin/false neo4j + fi +} + warn_about_java_home() { echo "------------------------------" echo "--- ACHTUNG ACHTUNG ALARM! ---" echo "------------------------------" - echo "Before starting the Neo4j service, please edit" - echo "'/usr/lib/systemd/system/neo4j.service', changing" - echo "'Environment=JAVA_HOME=/your/java/home/path' to your" - echo "actual JAVA_HOME path. Do not forget to uncomment" - echo "that line too and then run 'systemctl daemon-reload'." + echo "Before starting the Neo4j service, create this file" + echo "" + echo "/etc/systemd/system/neo4j.service.d/java_home.conf" + echo "" + echo "with the following content:" + echo "" + echo "[Service]" + echo "Environment=JAVA_HOME=/your/java/home/path" + echo "" + echo "changing '/your/java/home/path' to your actual JAVA_HOME path." } diff --git a/neo4j.service b/neo4j.service index 0b06ec166e16..d14fbb473ed7 100644 --- a/neo4j.service +++ b/neo4j.service @@ -8,7 +8,6 @@ ExecStart=/usr/bin/neo4j start ExecStop=/usr/bin/neo4j stop PIDFile=/run/neo4j/neo4j-service.pid LimitNOFILE=40000 -# Environment=JAVA_HOME=/your/java/home/path [Install] WantedBy=multi-user.target |