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

[Massimiliano Torromeo]

    Date: Wednesday, September 3, 2014 @ 11:48:30
  Author: mtorromeo
Revision: 118219

upgpkg: elasticsearch 1.3.2-3

Fixed JAVA_HOME and using sysusers.d to create the elasticsearch user

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

------------------------+
 PKGBUILD               |   11 +++++++----
 elasticsearch.default  |    2 +-
 elasticsearch.install  |    8 ++------
 elasticsearch.service  |    2 +-
 elasticsearch at .service |    2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-03 09:26:05 UTC (rev 118218)
+++ PKGBUILD	2014-09-03 09:48:30 UTC (rev 118219)
@@ -5,7 +5,7 @@
 
 pkgname=elasticsearch
 pkgver=1.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('i686' 'x86_64')
 url="http://www.elasticsearch.org/"
@@ -17,15 +17,17 @@
   elasticsearch.service
   elasticsearch at .service
   elasticsearch-sysctl.conf
+  elasticsearch-user.conf
   elasticsearch-tmpfile.conf
   elasticsearch.default
 )
 sha256sums=('7525d0a4db4f7eb791a1f8da97b081a5d8b44a2b232d8324877177bdee992ea4'
-            '3c3aaa3439b7b5db2171cb87f674a5df0f74aed427e87debebb780738b1557cb'
-            'fe6c38d29bdde0ea5c0f1798bcd194912a269167cd8caa35289fbb59c037cfda'
+            '8f1b4f6e22b472a4f4e711f010d6733a06935b46bb7314360f27c2ab506d6e46'
+            '7c1e06cdf838b5ad090e0463de5dab3e8d62f0d7e6ac04e0b0049a4007dee612'
             'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
+            'a76c03afe30dc3434bf55b5b50f0867c3670dcaebcc8b522f42277ff523b7277'
             '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9'
-            'd29a050c80739801a340231a8bf5e8b565ee2a46285482f3425319349c2df6c5')
+            'bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8')
 
 backup=('etc/elasticsearch/elasticsearch.yml'
         'etc/elasticsearch/logging.yml'
@@ -70,6 +72,7 @@
 
   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
 

Modified: elasticsearch.default
===================================================================
--- elasticsearch.default	2014-09-03 09:26:05 UTC (rev 118218)
+++ elasticsearch.default	2014-09-03 09:48:30 UTC (rev 118219)
@@ -1,4 +1,4 @@
-JAVA_HOME=/usr/lib/jvm/java-default-runtime
+JAVA_HOME=/usr/lib/jvm/default-runtime
 
 # Heap Size (defaults to 256m min, 1g max)
 #ES_HEAP_SIZE=1g

Modified: elasticsearch.install
===================================================================
--- elasticsearch.install	2014-09-03 09:26:05 UTC (rev 118218)
+++ elasticsearch.install	2014-09-03 09:48:30 UTC (rev 118219)
@@ -1,15 +1,11 @@
 post_install() {
-    getent group elasticsearch >/dev/null 2>&1 || groupadd -g 114 elasticsearch &>/dev/null
-    getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null
-
+    systemd-sysusers elasticsearch.conf
     systemd-tmpfiles --create elasticsearch.conf
     chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
 }
 
 post_upgrade(){
-    getent group elasticsearch >/dev/null 2>&1 || groupadd -g 114 elasticsearch &>/dev/null
-    getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null
-    
+    systemd-sysusers elasticsearch.conf
     systemd-tmpfiles --create elasticsearch.conf
 }
 

Modified: elasticsearch.service
===================================================================
--- elasticsearch.service	2014-09-03 09:26:05 UTC (rev 118218)
+++ elasticsearch.service	2014-09-03 09:48:30 UTC (rev 118219)
@@ -8,7 +8,7 @@
 User=elasticsearch
 Group=elasticsearch
 ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid
-Environment=JAVA_HOME=/usr/lib/jvm/java-default-runtime
+Environment=JAVA_HOME=/usr/lib/jvm/default-runtime
 EnvironmentFile=-/etc/default/elasticsearch
 RuntimeDirectory=elasticsearch
 PIDFile=/run/elasticsearch/elasticsearch.pid

Modified: elasticsearch at .service
===================================================================
--- elasticsearch at .service	2014-09-03 09:26:05 UTC (rev 118218)
+++ elasticsearch at .service	2014-09-03 09:48:30 UTC (rev 118219)
@@ -8,7 +8,7 @@
 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/java-default-runtime
+Environment=JAVA_HOME=/usr/lib/jvm/default-runtime
 EnvironmentFile=-/etc/default/elasticsearch
 RuntimeDirectory=elasticsearch
 PIDFile=/run/elasticsearch/%I.pid