[arch-commits] Commit in elasticsearch/trunk (4 files)

Massimiliano Torromeo mtorromeo at archlinux.org
Thu Oct 29 09:41:03 UTC 2015 

    Date: Thursday, October 29, 2015 @ 10:41:03
  Author: mtorromeo
Revision: 145238

upgpkg: elasticsearch 2.0.0-1

Updated to 2.0.0 and streamlined package to be more in line with official ones

Modified:
  elasticsearch/trunk/PKGBUILD
  elasticsearch/trunk/elasticsearch.install
  elasticsearch/trunk/elasticsearch.service
  elasticsearch/trunk/elasticsearch at .service

------------------------+
 PKGBUILD               |   56 ++++++++++++++++++++---------------------------
 elasticsearch.install  |    6 +++++
 elasticsearch.service  |   34 +++++++++++++++++++++-------
 elasticsearch at .service |   34 +++++++++++++++++++++-------
 4 files changed, 82 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-29 09:33:47 UTC (rev 145237)
+++ PKGBUILD	2015-10-29 09:41:03 UTC (rev 145238)
@@ -4,16 +4,16 @@
 # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
 
 pkgname=elasticsearch
-pkgver=1.7.3
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
-arch=('i686' 'x86_64')
+arch=('any')
 url="https://www.elastic.co/products/elasticsearch"
 license=('APACHE')
 depends=('java-runtime-headless' 'systemd')
 install='elasticsearch.install'
 source=(
-  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
+  "http://download.elasticsearch.org/$pkgname/release/org/$pkgname/distribution/tar/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
   elasticsearch.service
   elasticsearch at .service
   elasticsearch-sysctl.conf
@@ -21,9 +21,9 @@
   elasticsearch-tmpfile.conf
   elasticsearch.default
 )
-sha256sums=('af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca'
-            '8f1b4f6e22b472a4f4e711f010d6733a06935b46bb7314360f27c2ab506d6e46'
-            '7c1e06cdf838b5ad090e0463de5dab3e8d62f0d7e6ac04e0b0049a4007dee612'
+sha256sums=('b25f13f615337c2072964fd9fc5c7250f8a2a983b22198daf93548285d5d16df'
+            'a59d1bf2efedc146edbc98c252da29a7b2d061fe19b6fda5c2ca0a67004ce374'
+            '59e9e5fbe7a4b7053e2f004e69213ed7cfa9ba4ae236d1fbe9f3fccd9c1fd073'
             'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
             'a76c03afe30dc3434bf55b5b50f0867c3670dcaebcc8b522f42277ff523b7277'
             '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9'
@@ -37,14 +37,11 @@
   cd "$srcdir"/$pkgname-$pkgver
 
   for script in plugin elasticsearch; do
-    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
-      -i bin/$script
+    sed -e 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
+        -e '/^ES_HOME=.*pwd/d' \
+        -i bin/$script
   done
 
-  sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh bin/plugin
-
-  echo -e '\nJAVA_OPTS="$JAVA_OPTS -Des.path.conf=/etc/elasticsearch"' >> bin/elasticsearch.in.sh
-
   sed -re 's;#\s*(path\.conf:).*$;\1 /etc/elasticsearch;' \
     -e '0,/#\s*(path\.data:).*$/s;;\1 /var/lib/elasticsearch;' \
     -e 's;#\s*(path\.work:).*$;\1 /tmp/elasticsearch;' \
@@ -53,17 +50,12 @@
 }
 
 package() {
+  install -dm755 "$pkgdir"/etc
+  install -dm750 -g 114 "$pkgdir"/etc/elasticsearch/scripts
+
   cd "$srcdir"/$pkgname-$pkgver
-  install -dm755 "$pkgdir"/etc/elasticsearch
-
-  if [ $CARCH = 'x86_64' ]; then
-    install -Dm644 lib/sigar/libsigar-amd64-linux.so "$pkgdir"/usr/lib/elasticsearch/sigar/libsigar-amd64-linux.so
-  else
-    install -Dm644 lib/sigar/libsigar-x86-linux.so "$pkgdir"/usr/lib/elasticsearch/sigar/libsigar-x86-linux.so
-  fi
-  cp lib/sigar/sigar*.jar "$pkgdir"/usr/lib/elasticsearch/sigar/
-  cp lib/*.jar "$pkgdir"/usr/lib/elasticsearch/
-
+  install -dm755 "$pkgdir"/usr/share/elasticsearch
+  cp -R lib "$pkgdir"/usr/share/elasticsearch/lib
   cp config/* "$pkgdir"/etc/elasticsearch/
 
   install -Dm755 bin/elasticsearch "$pkgdir"/usr/bin/elasticsearch
@@ -70,15 +62,15 @@
   install -Dm755 bin/plugin "$pkgdir"/usr/bin/elasticsearch-plugin
   install -Dm644 bin/elasticsearch.in.sh "$pkgdir"/usr/share/elasticsearch/elasticsearch.in.sh
 
-  install -Dm644 "$srcdir"/elasticsearch.service "$pkgdir"/usr/lib/systemd/system/elasticsearch.service
-  install -Dm644 "$srcdir"/elasticsearch at .service "$pkgdir"/usr/lib/systemd/system/elasticsearch at .service
-  install -Dm644 "$srcdir"/elasticsearch-user.conf "$pkgdir"/usr/lib/sysusers.d/elasticsearch.conf
-  install -Dm644 "$srcdir"/elasticsearch-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/elasticsearch.conf
-  install -Dm644 "$srcdir"/elasticsearch-sysctl.conf "$pkgdir"/usr/lib/sysctl.d/elasticsearch.conf
+  cd "$pkgdir"
+  install -dm750 -g 114 etc/elasticsearch/scripts
+  install -Dm644 "$srcdir"/elasticsearch.service usr/lib/systemd/system/elasticsearch.service
+  install -Dm644 "$srcdir"/elasticsearch at .service usr/lib/systemd/system/elasticsearch at .service
+  install -Dm644 "$srcdir"/elasticsearch-user.conf usr/lib/sysusers.d/elasticsearch.conf
+  install -Dm644 "$srcdir"/elasticsearch-tmpfile.conf usr/lib/tmpfiles.d/elasticsearch.conf
+  install -Dm644 "$srcdir"/elasticsearch-sysctl.conf usr/lib/sysctl.d/elasticsearch.conf
+  install -Dm644 "$srcdir"/elasticsearch.default etc/default/elasticsearch
 
-  install -Dm644 "$srcdir"/elasticsearch.default "$pkgdir"/etc/default/elasticsearch
-
-  ln -s ../../../var/lib/elasticsearch "$pkgdir"/usr/share/elasticsearch/data
-
-  chown -R 114:114 "$pkgdir"/usr/share/elasticsearch
+  chgrp -R 114 etc/elasticsearch
+  install -o 114 -g 114 -dm755 usr/share/elasticsearch/plugins
 }

Modified: elasticsearch.install
===================================================================
--- elasticsearch.install	2015-10-29 09:33:47 UTC (rev 145237)
+++ elasticsearch.install	2015-10-29 09:41:03 UTC (rev 145238)
@@ -5,4 +5,10 @@
 
 post_upgrade(){
     systemd-tmpfiles --create elasticsearch.conf
+
+    if [ "$(vercmp $2 2.0.0)" -lt 0 ]; then
+        echo " >> "
+        echo " >> Major version update. PLease take a look at breaking changes https://www.elastic.co/guide/en/elasticsearch/reference/2.0/breaking-changes-2.0.html and remove incompatible plugins from /usr/share/elasticsearch/plugins"
+        echo " >> "
+    fi
 }

Modified: elasticsearch.service
===================================================================
--- elasticsearch.service	2015-10-29 09:33:47 UTC (rev 145237)
+++ elasticsearch.service	2015-10-29 09:41:03 UTC (rev 145238)
@@ -1,20 +1,38 @@
 [Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
+Description=Elasticsearch
+Documentation=http://www.elastic.co
+Wants=network.target
 After=network.target
 
 [Service]
 Type=forking
+RuntimeDirectory=elasticsearch
+PIDFile=/run/elasticsearch/elasticsearch.pid
+
+Environment=JAVA_HOME=/usr/lib/jvm/default-runtime
+Environment=ES_HOME=/usr/share/elasticsearch
+Environment=CONF_DIR=/etc/elasticsearch
+Environment=DATA_DIR=/var/lib/elasticsearch
+Environment=LOG_DIR=/var/log/elasticsearch
+EnvironmentFile=-/etc/default/elasticsearch
+
+WorkingDirectory=/usr/share/elasticsearch
+
 User=elasticsearch
 Group=elasticsearch
-ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid
-Environment=JAVA_HOME=/usr/lib/jvm/default-runtime
-EnvironmentFile=-/etc/default/elasticsearch
-RuntimeDirectory=elasticsearch
-PIDFile=/run/elasticsearch/elasticsearch.pid
+
+ExecStart=/usr/bin/elasticsearch -d \
+						-p /run/elasticsearch/elasticsearch.pid \
+						-Des.default.path.home=${ES_HOME} \
+						-Des.default.path.logs=${LOG_DIR} \
+						-Des.default.path.data=${DATA_DIR} \
+						-Des.default.path.conf=${CONF_DIR}
+
+SuccessExitStatus=143
+
 LimitNOFILE=65535
 LimitMEMLOCK=infinity
-TimeoutStopSec=20
+TimeoutStopSec=120
 Restart=on-failure
 
 [Install]

Modified: elasticsearch at .service
===================================================================
--- elasticsearch at .service	2015-10-29 09:33:47 UTC (rev 145237)
+++ elasticsearch at .service	2015-10-29 09:41:03 UTC (rev 145238)
@@ -1,20 +1,38 @@
 [Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
+Description=Elasticsearch
+Documentation=http://www.elastic.co
+Wants=network.target
 After=network.target
 
 [Service]
 Type=forking
+RuntimeDirectory=elasticsearch
+PIDFile=/run/elasticsearch/%I.pid
+
+Environment=JAVA_HOME=/usr/lib/jvm/default-runtime
+Environment=ES_HOME=/usr/share/elasticsearch
+Environment=CONF_DIR=/etc/elasticsearch/%I
+Environment=DATA_DIR=/var/lib/elasticsearch/%I
+Environment=LOG_DIR=/var/log/elasticsearch
+EnvironmentFile=-/etc/default/elasticsearch
+
+WorkingDirectory=/usr/share/elasticsearch
+
 User=elasticsearch
 Group=elasticsearch
-ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml
-Environment=JAVA_HOME=/usr/lib/jvm/default-runtime
-EnvironmentFile=-/etc/default/elasticsearch
-RuntimeDirectory=elasticsearch
-PIDFile=/run/elasticsearch/%I.pid
+
+ExecStart=/usr/bin/elasticsearch -d \
+						-p /run/elasticsearch/%I.pid \
+						-Des.default.path.home=${ES_HOME} \
+						-Des.default.path.logs=${LOG_DIR} \
+						-Des.default.path.data=${DATA_DIR} \
+						-Des.default.path.conf=${CONF_DIR}
+
+SuccessExitStatus=143
+
 LimitNOFILE=65535
 LimitMEMLOCK=infinity
-TimeoutStopSec=20
+TimeoutStopSec=120
 Restart=on-failure
 
 [Install]

More information about the arch-commits mailing list