Update to 0.55.2

4 files changed, 27 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50b77f27df2f..5970e7f9f70c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jun 27 14:49:11 UTC 2016
+# Tue Jul 12 06:50:04 UTC 2016
 pkgbase = crate
 	pkgdesc = shared nothing, fully searchable, document oriented cluster datastore.
-	pkgver = 0.54.11
+	pkgver = 0.55.2
 	pkgrel = 1
 	url = http://crate.io
 	install = crate.install
@@ -11,8 +11,12 @@ pkgbase = crate
 	depends = java-runtime
 	backup = etc/crate/crate.yml
 	backup = etc/crate/logging.yml
-	source = https://cdn.crate.io/downloads/releases/crate-0.54.11.tar.gz
+	source = https://cdn.crate.io/downloads/releases/crate-0.55.2.tar.gz
 	source = crate.service
+	source = crate
+	md5sums = 87bb56b5a6d40efa4113c5e2e357fe89
+	md5sums = 2085d9af9e9ef3e27e8067a793eb9e39
+	md5sums = 763950135dadfc3f72d8c9abec71aa5a
 
 pkgname = crate
 
diff --git a/PKGBUILD b/PKGBUILD
index 926a22cd1ba9..9d41d2cbd077 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=crate
-pkgver=0.54.11
+pkgver=0.55.2
 pkgrel=1
 pkgdesc="shared nothing, fully searchable, document oriented cluster datastore."
 arch=('any')
@@ -8,7 +8,8 @@ license=('custom:APACHE')
 depends=('java-runtime')
 install='crate.install'
 source=(https://cdn.crate.io/downloads/releases/$pkgname-$pkgver.tar.gz
-        crate.service)
+        crate.service
+        crate)
 
 backup=('etc/crate/crate.yml'
         'etc/crate/logging.yml')
@@ -17,21 +18,21 @@ package() {
     cd "$srcdir/$pkgname-$pkgver"
 
     # create dirs
-    install -dm755 "$pkgdir/usr/share/$pkgname/"
     install -dm755 "$pkgdir/etc/$pkgname/"
-    install -dm755 "$pkgdir/var/lib/$pkgname/"
     install -dm755 "$pkgdir/var/log/$pkgname/"
+    install -dm755 "$pkgdir/usr/share/$pkgname/"
+    cp -R bin lib plugins "$pkgdir/usr/share/$pkgname/"
+
+    rm $pkgdir/usr/share/$pkgname/plugins/sigar/lib/*
+    cp plugins/sigar/lib/*.jar $pkgdir/usr/share/$pkgname/plugins/sigar/lib/
 
     if [ $CARCH = 'x86_64' ]; then
-        install -Dm644 lib/sigar/libsigar-amd64-linux.so "$pkgdir/usr/share/crate/lib/sigar/libsigar-amd64-linux.so"
+        install -Dm644 plugins/sigar/lib/libsigar-amd64-linux.so "$pkgdir/usr/share/crate/plugins/sigar/lib/libsigar-amd64-linux.so"
     else
-        install -Dm644 lib/sigar/libsigar-x86-linux.so "$pkgdir/usr/share/crate/lib/sigar/libsigar-x86-linux.so"
+        install -Dm644 plugins/sigar/lib/libsigar-x86-linux.so "$pkgdir/usr/share/crate/plugins/sigar/lib/libsigar-x86-linux.so"
     fi
-    cp lib/sigar/sigar*.jar "$pkgdir/usr/share/crate/lib/sigar/"
-    cp lib/*.jar "$pkgdir/usr/share/crate/lib/"
 
     cp config/* $pkgdir/etc/$pkgname
-    cp -r {bin,plugins} $pkgdir/usr/share/crate
 
     # documentation
     install -dm755 $pkgdir/usr/share/doc/$pkgname/
@@ -39,9 +40,13 @@ package() {
     cp NOTICE $pkgdir/usr/share/doc/$pkgname/NOTICE
     cp CHANGES.txt $pkgdir/usr/share/doc/$pkgname/CHANGES
 
+    install -Dm644 "$srcdir/crate" "$pkgdir/etc/conf.d/crate"
     install -Dm644 "$srcdir/crate.service" "$pkgdir/usr/lib/systemd/system/crate.service"
     # sphinx generated text docs
     if [ -d docs ]; then
         cp -r docs/ $pkgdir/usr/share/doc/$pkgname/
     fi
 }
+md5sums=('87bb56b5a6d40efa4113c5e2e357fe89'
+         '2085d9af9e9ef3e27e8067a793eb9e39'
+         '763950135dadfc3f72d8c9abec71aa5a')
diff --git a/crate b/crate
new file mode 100644
index 000000000000..1d0a616ec2ea
--- /dev/null
+++ b/crate
@@ -0,0 +1,2 @@
+CRATE_MIN_MEM=256m
+CRATE_MAX_MEM=1g
diff --git a/crate.service b/crate.service
index bd923fc54e47..af3d04a60f23 100644
--- a/crate.service
+++ b/crate.service
@@ -4,9 +4,11 @@ After=network.target
 
 [Service]
 User=crate
+EnvironmentFile=-/etc/conf.d/crate
 ExecStart=/usr/share/crate/bin/crate -Des.path.conf=/etc/crate -Des.path.home=/usr/share/crate -Des.path.logs=/var/log/crate -Des.path.work=/var/lib/crate
-Environment=CRATE_MIN_MEM=256m
-Environment=CRATE_MAX_MEM=1g
+
+LimitMEMLOCK=infinity
+LimitNOFILE=65535
 
 [Install]
 WantedBy=multi-user.target