[arch-commits] Commit in elasticsearch/repos (28 files)

Massimiliano Torromeo mtorromeo at archlinux.org
Wed Sep 3 09:50:09 UTC 2014


    Date: Wednesday, September 3, 2014 @ 11:50:08
  Author: mtorromeo
Revision: 118220

archrelease: copy trunk to community-i686, community-x86_64

Added:
  elasticsearch/repos/community-i686/PKGBUILD
    (from rev 118219, elasticsearch/trunk/PKGBUILD)
  elasticsearch/repos/community-i686/elasticsearch-sysctl.conf
    (from rev 118219, elasticsearch/trunk/elasticsearch-sysctl.conf)
  elasticsearch/repos/community-i686/elasticsearch-tmpfile.conf
    (from rev 118219, elasticsearch/trunk/elasticsearch-tmpfile.conf)
  elasticsearch/repos/community-i686/elasticsearch.default
    (from rev 118219, elasticsearch/trunk/elasticsearch.default)
  elasticsearch/repos/community-i686/elasticsearch.install
    (from rev 118219, elasticsearch/trunk/elasticsearch.install)
  elasticsearch/repos/community-i686/elasticsearch.service
    (from rev 118219, elasticsearch/trunk/elasticsearch.service)
  elasticsearch/repos/community-i686/elasticsearch at .service
    (from rev 118219, elasticsearch/trunk/elasticsearch at .service)
  elasticsearch/repos/community-x86_64/PKGBUILD
    (from rev 118219, elasticsearch/trunk/PKGBUILD)
  elasticsearch/repos/community-x86_64/elasticsearch-sysctl.conf
    (from rev 118219, elasticsearch/trunk/elasticsearch-sysctl.conf)
  elasticsearch/repos/community-x86_64/elasticsearch-tmpfile.conf
    (from rev 118219, elasticsearch/trunk/elasticsearch-tmpfile.conf)
  elasticsearch/repos/community-x86_64/elasticsearch.default
    (from rev 118219, elasticsearch/trunk/elasticsearch.default)
  elasticsearch/repos/community-x86_64/elasticsearch.install
    (from rev 118219, elasticsearch/trunk/elasticsearch.install)
  elasticsearch/repos/community-x86_64/elasticsearch.service
    (from rev 118219, elasticsearch/trunk/elasticsearch.service)
  elasticsearch/repos/community-x86_64/elasticsearch at .service
    (from rev 118219, elasticsearch/trunk/elasticsearch at .service)
Deleted:
  elasticsearch/repos/community-i686/PKGBUILD
  elasticsearch/repos/community-i686/elasticsearch-sysctl.conf
  elasticsearch/repos/community-i686/elasticsearch-tmpfile.conf
  elasticsearch/repos/community-i686/elasticsearch.default
  elasticsearch/repos/community-i686/elasticsearch.install
  elasticsearch/repos/community-i686/elasticsearch.service
  elasticsearch/repos/community-i686/elasticsearch at .service
  elasticsearch/repos/community-x86_64/PKGBUILD
  elasticsearch/repos/community-x86_64/elasticsearch-sysctl.conf
  elasticsearch/repos/community-x86_64/elasticsearch-tmpfile.conf
  elasticsearch/repos/community-x86_64/elasticsearch.default
  elasticsearch/repos/community-x86_64/elasticsearch.install
  elasticsearch/repos/community-x86_64/elasticsearch.service
  elasticsearch/repos/community-x86_64/elasticsearch at .service

---------------------------------------------+
 /PKGBUILD                                   |  164 ++++++++++++++++++++++++++
 /elasticsearch-sysctl.conf                  |    2 
 /elasticsearch-tmpfile.conf                 |    4 
 /elasticsearch.default                      |   26 ++++
 /elasticsearch.install                      |   38 ++++++
 /elasticsearch.service                      |   42 ++++++
 /elasticsearch at .service                     |   42 ++++++
 community-i686/PKGBUILD                     |   79 ------------
 community-i686/elasticsearch-sysctl.conf    |    1 
 community-i686/elasticsearch-tmpfile.conf   |    2 
 community-i686/elasticsearch.default        |   13 --
 community-i686/elasticsearch.install        |   23 ---
 community-i686/elasticsearch.service        |   21 ---
 community-i686/elasticsearch at .service       |   21 ---
 community-x86_64/PKGBUILD                   |   79 ------------
 community-x86_64/elasticsearch-sysctl.conf  |    1 
 community-x86_64/elasticsearch-tmpfile.conf |    2 
 community-x86_64/elasticsearch.default      |   13 --
 community-x86_64/elasticsearch.install      |   23 ---
 community-x86_64/elasticsearch.service      |   21 ---
 community-x86_64/elasticsearch at .service     |   21 ---
 21 files changed, 318 insertions(+), 320 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-i686/PKGBUILD	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
-# Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
-
-pkgname=elasticsearch
-pkgver=1.3.2
-pkgrel=2
-pkgdesc="Distributed RESTful search engine built on top of Lucene"
-arch=('i686' 'x86_64')
-url="http://www.elasticsearch.org/"
-license=('APACHE')
-depends=('java-runtime' 'systemd')
-install='elasticsearch.install'
-source=(
-  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
-  elasticsearch.service
-  elasticsearch at .service
-  elasticsearch-sysctl.conf
-  elasticsearch-tmpfile.conf
-  elasticsearch.default
-)
-sha256sums=('7525d0a4db4f7eb791a1f8da97b081a5d8b44a2b232d8324877177bdee992ea4'
-            '3c3aaa3439b7b5db2171cb87f674a5df0f74aed427e87debebb780738b1557cb'
-            'fe6c38d29bdde0ea5c0f1798bcd194912a269167cd8caa35289fbb59c037cfda'
-            'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
-            '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9'
-            'd29a050c80739801a340231a8bf5e8b565ee2a46285482f3425319349c2df6c5')
-
-backup=('etc/elasticsearch/elasticsearch.yml'
-        'etc/elasticsearch/logging.yml'
-        'etc/default/elasticsearch')
-
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  for script in plugin elasticsearch; do
-    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
-      -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;' \
-    -e 's;#\s*(path\.logs:).*$;\1 /var/log/elasticsearch;' \
-    -i config/elasticsearch.yml
-}
-
-package() {
-  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/
-
-  cp config/* "$pkgdir"/etc/elasticsearch/
-
-  install -Dm755 bin/elasticsearch "$pkgdir"/usr/bin/elasticsearch
-  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-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/elasticsearch.conf
-  install -Dm644 "$srcdir"/elasticsearch-sysctl.conf "$pkgdir"/usr/lib/sysctl.d/elasticsearch.conf
-
-  install -Dm644 "$srcdir"/elasticsearch.default "$pkgdir"/etc/default/elasticsearch
-
-  ln -s ../../../var/lib/elasticsearch "$pkgdir"/usr/share/elasticsearch/data
-}

Copied: elasticsearch/repos/community-i686/PKGBUILD (from rev 118219, elasticsearch/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
+# Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
+
+pkgname=elasticsearch
+pkgver=1.3.2
+pkgrel=3
+pkgdesc="Distributed RESTful search engine built on top of Lucene"
+arch=('i686' 'x86_64')
+url="http://www.elasticsearch.org/"
+license=('APACHE')
+depends=('java-runtime' 'systemd')
+install='elasticsearch.install'
+source=(
+  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
+  elasticsearch.service
+  elasticsearch at .service
+  elasticsearch-sysctl.conf
+  elasticsearch-user.conf
+  elasticsearch-tmpfile.conf
+  elasticsearch.default
+)
+sha256sums=('7525d0a4db4f7eb791a1f8da97b081a5d8b44a2b232d8324877177bdee992ea4'
+            '8f1b4f6e22b472a4f4e711f010d6733a06935b46bb7314360f27c2ab506d6e46'
+            '7c1e06cdf838b5ad090e0463de5dab3e8d62f0d7e6ac04e0b0049a4007dee612'
+            'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
+            'a76c03afe30dc3434bf55b5b50f0867c3670dcaebcc8b522f42277ff523b7277'
+            '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9'
+            'bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8')
+
+backup=('etc/elasticsearch/elasticsearch.yml'
+        'etc/elasticsearch/logging.yml'
+        'etc/default/elasticsearch')
+
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  for script in plugin elasticsearch; do
+    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
+      -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;' \
+    -e 's;#\s*(path\.logs:).*$;\1 /var/log/elasticsearch;' \
+    -i config/elasticsearch.yml
+}
+
+package() {
+  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/
+
+  cp config/* "$pkgdir"/etc/elasticsearch/
+
+  install -Dm755 bin/elasticsearch "$pkgdir"/usr/bin/elasticsearch
+  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
+
+  install -Dm644 "$srcdir"/elasticsearch.default "$pkgdir"/etc/default/elasticsearch
+
+  ln -s ../../../var/lib/elasticsearch "$pkgdir"/usr/share/elasticsearch/data
+}

Deleted: community-i686/elasticsearch-sysctl.conf
===================================================================
--- community-i686/elasticsearch-sysctl.conf	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-i686/elasticsearch-sysctl.conf	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1 +0,0 @@
-vm.max_map_count=262144
\ No newline at end of file

Copied: elasticsearch/repos/community-i686/elasticsearch-sysctl.conf (from rev 118219, elasticsearch/trunk/elasticsearch-sysctl.conf)
===================================================================
--- community-i686/elasticsearch-sysctl.conf	                        (rev 0)
+++ community-i686/elasticsearch-sysctl.conf	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1 @@
+vm.max_map_count=262144
\ No newline at end of file

Deleted: community-i686/elasticsearch-tmpfile.conf
===================================================================
--- community-i686/elasticsearch-tmpfile.conf	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-i686/elasticsearch-tmpfile.conf	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,2 +0,0 @@
-d /var/log/elasticsearch 0755 elasticsearch elasticsearch - 
-d /var/lib/elasticsearch 0755 elasticsearch elasticsearch - 

Copied: elasticsearch/repos/community-i686/elasticsearch-tmpfile.conf (from rev 118219, elasticsearch/trunk/elasticsearch-tmpfile.conf)
===================================================================
--- community-i686/elasticsearch-tmpfile.conf	                        (rev 0)
+++ community-i686/elasticsearch-tmpfile.conf	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,2 @@
+d /var/log/elasticsearch 0755 elasticsearch elasticsearch - 
+d /var/lib/elasticsearch 0755 elasticsearch elasticsearch - 

Deleted: community-i686/elasticsearch.default
===================================================================
--- community-i686/elasticsearch.default	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-i686/elasticsearch.default	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,13 +0,0 @@
-JAVA_HOME=/usr/lib/jvm/java-default-runtime
-
-# Heap Size (defaults to 256m min, 1g max)
-#ES_HEAP_SIZE=1g
-
-# Heap new generation
-#ES_HEAP_NEWSIZE=
-
-# max direct memory
-#ES_DIRECT_SIZE=
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=

Copied: elasticsearch/repos/community-i686/elasticsearch.default (from rev 118219, elasticsearch/trunk/elasticsearch.default)
===================================================================
--- community-i686/elasticsearch.default	                        (rev 0)
+++ community-i686/elasticsearch.default	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,13 @@
+JAVA_HOME=/usr/lib/jvm/default-runtime
+
+# Heap Size (defaults to 256m min, 1g max)
+#ES_HEAP_SIZE=1g
+
+# Heap new generation
+#ES_HEAP_NEWSIZE=
+
+# max direct memory
+#ES_DIRECT_SIZE=
+
+# Additional Java OPTS
+#ES_JAVA_OPTS=

Deleted: community-i686/elasticsearch.install
===================================================================
--- community-i686/elasticsearch.install	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-i686/elasticsearch.install	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,23 +0,0 @@
-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-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-tmpfiles --create elasticsearch.conf
-}
-
-post_remove() {
-    if getent passwd elasticsearch >/dev/null 2>&1; then
-        userdel elasticsearch
-    fi
-    if getent group elasticsearch >/dev/null 2>&1; then
-        groupdel elasticsearch
-    fi
-}

Copied: elasticsearch/repos/community-i686/elasticsearch.install (from rev 118219, elasticsearch/trunk/elasticsearch.install)
===================================================================
--- community-i686/elasticsearch.install	                        (rev 0)
+++ community-i686/elasticsearch.install	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,19 @@
+post_install() {
+    systemd-sysusers elasticsearch.conf
+    systemd-tmpfiles --create elasticsearch.conf
+    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
+}
+
+post_upgrade(){
+    systemd-sysusers elasticsearch.conf
+    systemd-tmpfiles --create elasticsearch.conf
+}
+
+post_remove() {
+    if getent passwd elasticsearch >/dev/null 2>&1; then
+        userdel elasticsearch
+    fi
+    if getent group elasticsearch >/dev/null 2>&1; then
+        groupdel elasticsearch
+    fi
+}

Deleted: community-i686/elasticsearch.service
===================================================================
--- community-i686/elasticsearch.service	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-i686/elasticsearch.service	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,21 +0,0 @@
-[Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
-After=network.target
-
-[Service]
-Type=forking
-User=elasticsearch
-Group=elasticsearch
-ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid
-Environment=JAVA_HOME=/usr/lib/jvm/java-default-runtime
-EnvironmentFile=-/etc/default/elasticsearch
-RuntimeDirectory=elasticsearch
-PIDFile=/run/elasticsearch/elasticsearch.pid
-LimitNOFILE=65535
-LimitMEMLOCK=infinity
-TimeoutStopSec=20
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

Copied: elasticsearch/repos/community-i686/elasticsearch.service (from rev 118219, elasticsearch/trunk/elasticsearch.service)
===================================================================
--- community-i686/elasticsearch.service	                        (rev 0)
+++ community-i686/elasticsearch.service	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,21 @@
+[Unit]
+Description=ElasticSearch
+Documentation=http://www.elasticsearch.org
+After=network.target
+
+[Service]
+Type=forking
+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
+LimitNOFILE=65535
+LimitMEMLOCK=infinity
+TimeoutStopSec=20
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/elasticsearch at .service
===================================================================
--- community-i686/elasticsearch at .service	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-i686/elasticsearch at .service	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,21 +0,0 @@
-[Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
-After=network.target
-
-[Service]
-Type=forking
-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
-EnvironmentFile=-/etc/default/elasticsearch
-RuntimeDirectory=elasticsearch
-PIDFile=/run/elasticsearch/%I.pid
-LimitNOFILE=65535
-LimitMEMLOCK=infinity
-TimeoutStopSec=20
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

Copied: elasticsearch/repos/community-i686/elasticsearch at .service (from rev 118219, elasticsearch/trunk/elasticsearch at .service)
===================================================================
--- community-i686/elasticsearch at .service	                        (rev 0)
+++ community-i686/elasticsearch at .service	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,21 @@
+[Unit]
+Description=ElasticSearch
+Documentation=http://www.elasticsearch.org
+After=network.target
+
+[Service]
+Type=forking
+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
+LimitNOFILE=65535
+LimitMEMLOCK=infinity
+TimeoutStopSec=20
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-x86_64/PKGBUILD	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
-# Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
-
-pkgname=elasticsearch
-pkgver=1.3.2
-pkgrel=2
-pkgdesc="Distributed RESTful search engine built on top of Lucene"
-arch=('i686' 'x86_64')
-url="http://www.elasticsearch.org/"
-license=('APACHE')
-depends=('java-runtime' 'systemd')
-install='elasticsearch.install'
-source=(
-  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
-  elasticsearch.service
-  elasticsearch at .service
-  elasticsearch-sysctl.conf
-  elasticsearch-tmpfile.conf
-  elasticsearch.default
-)
-sha256sums=('7525d0a4db4f7eb791a1f8da97b081a5d8b44a2b232d8324877177bdee992ea4'
-            '3c3aaa3439b7b5db2171cb87f674a5df0f74aed427e87debebb780738b1557cb'
-            'fe6c38d29bdde0ea5c0f1798bcd194912a269167cd8caa35289fbb59c037cfda'
-            'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
-            '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9'
-            'd29a050c80739801a340231a8bf5e8b565ee2a46285482f3425319349c2df6c5')
-
-backup=('etc/elasticsearch/elasticsearch.yml'
-        'etc/elasticsearch/logging.yml'
-        'etc/default/elasticsearch')
-
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  for script in plugin elasticsearch; do
-    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
-      -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;' \
-    -e 's;#\s*(path\.logs:).*$;\1 /var/log/elasticsearch;' \
-    -i config/elasticsearch.yml
-}
-
-package() {
-  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/
-
-  cp config/* "$pkgdir"/etc/elasticsearch/
-
-  install -Dm755 bin/elasticsearch "$pkgdir"/usr/bin/elasticsearch
-  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-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/elasticsearch.conf
-  install -Dm644 "$srcdir"/elasticsearch-sysctl.conf "$pkgdir"/usr/lib/sysctl.d/elasticsearch.conf
-
-  install -Dm644 "$srcdir"/elasticsearch.default "$pkgdir"/etc/default/elasticsearch
-
-  ln -s ../../../var/lib/elasticsearch "$pkgdir"/usr/share/elasticsearch/data
-}

Copied: elasticsearch/repos/community-x86_64/PKGBUILD (from rev 118219, elasticsearch/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
+# Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
+
+pkgname=elasticsearch
+pkgver=1.3.2
+pkgrel=3
+pkgdesc="Distributed RESTful search engine built on top of Lucene"
+arch=('i686' 'x86_64')
+url="http://www.elasticsearch.org/"
+license=('APACHE')
+depends=('java-runtime' 'systemd')
+install='elasticsearch.install'
+source=(
+  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
+  elasticsearch.service
+  elasticsearch at .service
+  elasticsearch-sysctl.conf
+  elasticsearch-user.conf
+  elasticsearch-tmpfile.conf
+  elasticsearch.default
+)
+sha256sums=('7525d0a4db4f7eb791a1f8da97b081a5d8b44a2b232d8324877177bdee992ea4'
+            '8f1b4f6e22b472a4f4e711f010d6733a06935b46bb7314360f27c2ab506d6e46'
+            '7c1e06cdf838b5ad090e0463de5dab3e8d62f0d7e6ac04e0b0049a4007dee612'
+            'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
+            'a76c03afe30dc3434bf55b5b50f0867c3670dcaebcc8b522f42277ff523b7277'
+            '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9'
+            'bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8')
+
+backup=('etc/elasticsearch/elasticsearch.yml'
+        'etc/elasticsearch/logging.yml'
+        'etc/default/elasticsearch')
+
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  for script in plugin elasticsearch; do
+    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
+      -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;' \
+    -e 's;#\s*(path\.logs:).*$;\1 /var/log/elasticsearch;' \
+    -i config/elasticsearch.yml
+}
+
+package() {
+  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/
+
+  cp config/* "$pkgdir"/etc/elasticsearch/
+
+  install -Dm755 bin/elasticsearch "$pkgdir"/usr/bin/elasticsearch
+  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
+
+  install -Dm644 "$srcdir"/elasticsearch.default "$pkgdir"/etc/default/elasticsearch
+
+  ln -s ../../../var/lib/elasticsearch "$pkgdir"/usr/share/elasticsearch/data
+}

Deleted: community-x86_64/elasticsearch-sysctl.conf
===================================================================
--- community-x86_64/elasticsearch-sysctl.conf	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-x86_64/elasticsearch-sysctl.conf	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1 +0,0 @@
-vm.max_map_count=262144
\ No newline at end of file

Copied: elasticsearch/repos/community-x86_64/elasticsearch-sysctl.conf (from rev 118219, elasticsearch/trunk/elasticsearch-sysctl.conf)
===================================================================
--- community-x86_64/elasticsearch-sysctl.conf	                        (rev 0)
+++ community-x86_64/elasticsearch-sysctl.conf	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1 @@
+vm.max_map_count=262144
\ No newline at end of file

Deleted: community-x86_64/elasticsearch-tmpfile.conf
===================================================================
--- community-x86_64/elasticsearch-tmpfile.conf	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-x86_64/elasticsearch-tmpfile.conf	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,2 +0,0 @@
-d /var/log/elasticsearch 0755 elasticsearch elasticsearch - 
-d /var/lib/elasticsearch 0755 elasticsearch elasticsearch - 

Copied: elasticsearch/repos/community-x86_64/elasticsearch-tmpfile.conf (from rev 118219, elasticsearch/trunk/elasticsearch-tmpfile.conf)
===================================================================
--- community-x86_64/elasticsearch-tmpfile.conf	                        (rev 0)
+++ community-x86_64/elasticsearch-tmpfile.conf	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,2 @@
+d /var/log/elasticsearch 0755 elasticsearch elasticsearch - 
+d /var/lib/elasticsearch 0755 elasticsearch elasticsearch - 

Deleted: community-x86_64/elasticsearch.default
===================================================================
--- community-x86_64/elasticsearch.default	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-x86_64/elasticsearch.default	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,13 +0,0 @@
-JAVA_HOME=/usr/lib/jvm/java-default-runtime
-
-# Heap Size (defaults to 256m min, 1g max)
-#ES_HEAP_SIZE=1g
-
-# Heap new generation
-#ES_HEAP_NEWSIZE=
-
-# max direct memory
-#ES_DIRECT_SIZE=
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=

Copied: elasticsearch/repos/community-x86_64/elasticsearch.default (from rev 118219, elasticsearch/trunk/elasticsearch.default)
===================================================================
--- community-x86_64/elasticsearch.default	                        (rev 0)
+++ community-x86_64/elasticsearch.default	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,13 @@
+JAVA_HOME=/usr/lib/jvm/default-runtime
+
+# Heap Size (defaults to 256m min, 1g max)
+#ES_HEAP_SIZE=1g
+
+# Heap new generation
+#ES_HEAP_NEWSIZE=
+
+# max direct memory
+#ES_DIRECT_SIZE=
+
+# Additional Java OPTS
+#ES_JAVA_OPTS=

Deleted: community-x86_64/elasticsearch.install
===================================================================
--- community-x86_64/elasticsearch.install	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-x86_64/elasticsearch.install	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,23 +0,0 @@
-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-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-tmpfiles --create elasticsearch.conf
-}
-
-post_remove() {
-    if getent passwd elasticsearch >/dev/null 2>&1; then
-        userdel elasticsearch
-    fi
-    if getent group elasticsearch >/dev/null 2>&1; then
-        groupdel elasticsearch
-    fi
-}

Copied: elasticsearch/repos/community-x86_64/elasticsearch.install (from rev 118219, elasticsearch/trunk/elasticsearch.install)
===================================================================
--- community-x86_64/elasticsearch.install	                        (rev 0)
+++ community-x86_64/elasticsearch.install	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,19 @@
+post_install() {
+    systemd-sysusers elasticsearch.conf
+    systemd-tmpfiles --create elasticsearch.conf
+    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
+}
+
+post_upgrade(){
+    systemd-sysusers elasticsearch.conf
+    systemd-tmpfiles --create elasticsearch.conf
+}
+
+post_remove() {
+    if getent passwd elasticsearch >/dev/null 2>&1; then
+        userdel elasticsearch
+    fi
+    if getent group elasticsearch >/dev/null 2>&1; then
+        groupdel elasticsearch
+    fi
+}

Deleted: community-x86_64/elasticsearch.service
===================================================================
--- community-x86_64/elasticsearch.service	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-x86_64/elasticsearch.service	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,21 +0,0 @@
-[Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
-After=network.target
-
-[Service]
-Type=forking
-User=elasticsearch
-Group=elasticsearch
-ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid
-Environment=JAVA_HOME=/usr/lib/jvm/java-default-runtime
-EnvironmentFile=-/etc/default/elasticsearch
-RuntimeDirectory=elasticsearch
-PIDFile=/run/elasticsearch/elasticsearch.pid
-LimitNOFILE=65535
-LimitMEMLOCK=infinity
-TimeoutStopSec=20
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

Copied: elasticsearch/repos/community-x86_64/elasticsearch.service (from rev 118219, elasticsearch/trunk/elasticsearch.service)
===================================================================
--- community-x86_64/elasticsearch.service	                        (rev 0)
+++ community-x86_64/elasticsearch.service	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,21 @@
+[Unit]
+Description=ElasticSearch
+Documentation=http://www.elasticsearch.org
+After=network.target
+
+[Service]
+Type=forking
+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
+LimitNOFILE=65535
+LimitMEMLOCK=infinity
+TimeoutStopSec=20
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/elasticsearch at .service
===================================================================
--- community-x86_64/elasticsearch at .service	2014-09-03 09:48:30 UTC (rev 118219)
+++ community-x86_64/elasticsearch at .service	2014-09-03 09:50:08 UTC (rev 118220)
@@ -1,21 +0,0 @@
-[Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
-After=network.target
-
-[Service]
-Type=forking
-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
-EnvironmentFile=-/etc/default/elasticsearch
-RuntimeDirectory=elasticsearch
-PIDFile=/run/elasticsearch/%I.pid
-LimitNOFILE=65535
-LimitMEMLOCK=infinity
-TimeoutStopSec=20
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

Copied: elasticsearch/repos/community-x86_64/elasticsearch at .service (from rev 118219, elasticsearch/trunk/elasticsearch at .service)
===================================================================
--- community-x86_64/elasticsearch at .service	                        (rev 0)
+++ community-x86_64/elasticsearch at .service	2014-09-03 09:50:08 UTC (rev 118220)
@@ -0,0 +1,21 @@
+[Unit]
+Description=ElasticSearch
+Documentation=http://www.elasticsearch.org
+After=network.target
+
+[Service]
+Type=forking
+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
+LimitNOFILE=65535
+LimitMEMLOCK=infinity
+TimeoutStopSec=20
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target




More information about the arch-commits mailing list