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

Massimiliano Torromeo mtorromeo at nymeria.archlinux.org
Wed Jan 29 16:48:56 UTC 2014


    Date: Wednesday, January 29, 2014 @ 17:48:56
  Author: mtorromeo
Revision: 104999

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

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

---------------------------------------------+
 /PKGBUILD                                   |  156 ++++++++++++++++++++++++++
 /elasticsearch-tmpfile.conf                 |    2 
 /elasticsearch.install                      |   48 ++++++++
 /elasticsearch.service                      |   26 ++++
 community-i686/PKGBUILD                     |   75 ------------
 community-i686/elasticsearch-tmpfile.conf   |    1 
 community-i686/elasticsearch.install        |   24 ----
 community-i686/elasticsearch.service        |   13 --
 community-i686/elasticsearch at .service       |   13 ++
 community-x86_64/PKGBUILD                   |   75 ------------
 community-x86_64/elasticsearch-tmpfile.conf |    1 
 community-x86_64/elasticsearch.install      |   24 ----
 community-x86_64/elasticsearch.service      |   13 --
 community-x86_64/elasticsearch at .service     |   13 ++
 14 files changed, 258 insertions(+), 226 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-01-29 16:44:18 UTC (rev 104998)
+++ community-i686/PKGBUILD	2014-01-29 16:48:56 UTC (rev 104999)
@@ -1,75 +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=0.90.10
-pkgrel=1
-pkgdesc="Distributed RESTful search engine built on top of Lucene"
-arch=('i686' 'x86_64')
-url="http://www.elasticsearch.org/"
-license=('APACHE')
-depends=('java-runtime' 'bash')
-install='elasticsearch.install'
-source=(
-  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
-  elasticsearch.service
-  elasticsearch-tmpfile.conf
-)
-
-backup=('etc/elasticsearch/elasticsearch.yml'
-        'etc/elasticsearch/logging.yml')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  for script in plugin elasticsearch; do
-    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
-      -i bin/$script
-
-    for java in jre jdk; do
-      sed "/^CDPATH/i [ -f /etc/profile.d/$java.sh ] && . /etc/profile.d/$java.sh" \
-        -i bin/$script
-    done
-  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 -e 's/# \(path\.conf: \).*$/\1\/etc\/elasticsearch/' \
-    -e '0,/# \(path\.data: \).*$/s//\1\/var\/lib\/elasticsearch/' \
-    -e 's/# \(path\.work: \).*$/\1\/tmp\/elasticsearch/' \
-    -e 's/# \(path\.logs: \).*$/\1\/var\/log\/elasticsearch/' \
-    -i config/elasticsearch.yml
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -dm755 "$pkgdir/etc/elasticsearch"
-  install -dm755 "$pkgdir/var/lib/elasticsearch"
-  install -dm755 "$pkgdir/var/log/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-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf"
-}
-
-sha256sums=('78c87f600878a6cab41c1d447f6a40b25892a59f8fb49da11392a682884fb8df'
-            '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb'
-            '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f')

Copied: elasticsearch/repos/community-i686/PKGBUILD (from rev 104998, elasticsearch/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1,78 @@
+# $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=0.90.10
+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' 'bash')
+install='elasticsearch.install'
+source=(
+  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
+  elasticsearch.service
+  elasticsearch at .service
+  elasticsearch-tmpfile.conf
+)
+
+backup=('etc/elasticsearch/elasticsearch.yml'
+        'etc/elasticsearch/logging.yml')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  for script in plugin elasticsearch; do
+    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
+      -i bin/$script
+
+    for java in jre jdk; do
+      sed "/^CDPATH/i [ -f /etc/profile.d/$java.sh ] && . /etc/profile.d/$java.sh" \
+        -i bin/$script
+    done
+  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 -e 's/# \(path\.conf: \).*$/\1\/etc\/elasticsearch/' \
+    -e '0,/# \(path\.data: \).*$/s//\1\/var\/lib\/elasticsearch/' \
+    -e 's/# \(path\.work: \).*$/\1\/tmp\/elasticsearch/' \
+    -e 's/# \(path\.logs: \).*$/\1\/var\/log\/elasticsearch/' \
+    -i config/elasticsearch.yml
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -dm755 "$pkgdir/etc/elasticsearch"
+  install -dm755 "$pkgdir/var/lib/elasticsearch"
+  install -dm755 "$pkgdir/var/log/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"
+}
+
+sha256sums=('78c87f600878a6cab41c1d447f6a40b25892a59f8fb49da11392a682884fb8df'
+            '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb'
+            'e3dd705bec204b8572456344b90c4773f867965a1215c22b6e9518f0aa268a2d'
+            '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f')

Deleted: community-i686/elasticsearch-tmpfile.conf
===================================================================
--- community-i686/elasticsearch-tmpfile.conf	2014-01-29 16:44:18 UTC (rev 104998)
+++ community-i686/elasticsearch-tmpfile.conf	2014-01-29 16:48:56 UTC (rev 104999)
@@ -1 +0,0 @@
-d /run/elasticsearch 0755 elasticsearch elasticsearch -
\ No newline at end of file

Copied: elasticsearch/repos/community-i686/elasticsearch-tmpfile.conf (from rev 104998, elasticsearch/trunk/elasticsearch-tmpfile.conf)
===================================================================
--- community-i686/elasticsearch-tmpfile.conf	                        (rev 0)
+++ community-i686/elasticsearch-tmpfile.conf	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1 @@
+d /run/elasticsearch 0755 elasticsearch elasticsearch -
\ No newline at end of file

Deleted: community-i686/elasticsearch.install
===================================================================
--- community-i686/elasticsearch.install	2014-01-29 16:44:18 UTC (rev 104998)
+++ community-i686/elasticsearch.install	2014-01-29 16:48:56 UTC (rev 104999)
@@ -1,24 +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
-
-    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
-    chown -R elasticsearch:elasticsearch /var/lib/elasticsearch
-    chown -R elasticsearch:elasticsearch /var/log/elasticsearch
-
-    usr/bin/systemd-tmpfiles --create elasticsearch.conf
-}
-
-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
-}
-
-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 104998, elasticsearch/trunk/elasticsearch.install)
===================================================================
--- community-i686/elasticsearch.install	                        (rev 0)
+++ community-i686/elasticsearch.install	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1,24 @@
+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
+
+    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
+    chown -R elasticsearch:elasticsearch /var/lib/elasticsearch
+    chown -R elasticsearch:elasticsearch /var/log/elasticsearch
+
+    usr/bin/systemd-tmpfiles --create elasticsearch.conf
+}
+
+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
+}
+
+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-01-29 16:44:18 UTC (rev 104998)
+++ community-i686/elasticsearch.service	2014-01-29 16:48:56 UTC (rev 104999)
@@ -1,13 +0,0 @@
-[Unit]
-Description=ElasticSearch
-After=network.target
-
-[Service]
-User=elasticsearch
-Type=forking
-PIDFile=/run/elasticsearch/elasticsearch.pid
-ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

Copied: elasticsearch/repos/community-i686/elasticsearch.service (from rev 104998, elasticsearch/trunk/elasticsearch.service)
===================================================================
--- community-i686/elasticsearch.service	                        (rev 0)
+++ community-i686/elasticsearch.service	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1,13 @@
+[Unit]
+Description=ElasticSearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Type=forking
+PIDFile=/run/elasticsearch/elasticsearch.pid
+ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

Copied: elasticsearch/repos/community-i686/elasticsearch at .service (from rev 104998, elasticsearch/trunk/elasticsearch at .service)
===================================================================
--- community-i686/elasticsearch at .service	                        (rev 0)
+++ community-i686/elasticsearch at .service	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1,13 @@
+[Unit]
+Description=ElasticSearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Type=forking
+PIDFile=/run/elasticsearch/%I.pid
+ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-01-29 16:44:18 UTC (rev 104998)
+++ community-x86_64/PKGBUILD	2014-01-29 16:48:56 UTC (rev 104999)
@@ -1,75 +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=0.90.10
-pkgrel=1
-pkgdesc="Distributed RESTful search engine built on top of Lucene"
-arch=('i686' 'x86_64')
-url="http://www.elasticsearch.org/"
-license=('APACHE')
-depends=('java-runtime' 'bash')
-install='elasticsearch.install'
-source=(
-  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
-  elasticsearch.service
-  elasticsearch-tmpfile.conf
-)
-
-backup=('etc/elasticsearch/elasticsearch.yml'
-        'etc/elasticsearch/logging.yml')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  for script in plugin elasticsearch; do
-    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
-      -i bin/$script
-
-    for java in jre jdk; do
-      sed "/^CDPATH/i [ -f /etc/profile.d/$java.sh ] && . /etc/profile.d/$java.sh" \
-        -i bin/$script
-    done
-  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 -e 's/# \(path\.conf: \).*$/\1\/etc\/elasticsearch/' \
-    -e '0,/# \(path\.data: \).*$/s//\1\/var\/lib\/elasticsearch/' \
-    -e 's/# \(path\.work: \).*$/\1\/tmp\/elasticsearch/' \
-    -e 's/# \(path\.logs: \).*$/\1\/var\/log\/elasticsearch/' \
-    -i config/elasticsearch.yml
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -dm755 "$pkgdir/etc/elasticsearch"
-  install -dm755 "$pkgdir/var/lib/elasticsearch"
-  install -dm755 "$pkgdir/var/log/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-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf"
-}
-
-sha256sums=('78c87f600878a6cab41c1d447f6a40b25892a59f8fb49da11392a682884fb8df'
-            '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb'
-            '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f')

Copied: elasticsearch/repos/community-x86_64/PKGBUILD (from rev 104998, elasticsearch/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1,78 @@
+# $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=0.90.10
+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' 'bash')
+install='elasticsearch.install'
+source=(
+  "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
+  elasticsearch.service
+  elasticsearch at .service
+  elasticsearch-tmpfile.conf
+)
+
+backup=('etc/elasticsearch/elasticsearch.yml'
+        'etc/elasticsearch/logging.yml')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  for script in plugin elasticsearch; do
+    sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
+      -i bin/$script
+
+    for java in jre jdk; do
+      sed "/^CDPATH/i [ -f /etc/profile.d/$java.sh ] && . /etc/profile.d/$java.sh" \
+        -i bin/$script
+    done
+  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 -e 's/# \(path\.conf: \).*$/\1\/etc\/elasticsearch/' \
+    -e '0,/# \(path\.data: \).*$/s//\1\/var\/lib\/elasticsearch/' \
+    -e 's/# \(path\.work: \).*$/\1\/tmp\/elasticsearch/' \
+    -e 's/# \(path\.logs: \).*$/\1\/var\/log\/elasticsearch/' \
+    -i config/elasticsearch.yml
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -dm755 "$pkgdir/etc/elasticsearch"
+  install -dm755 "$pkgdir/var/lib/elasticsearch"
+  install -dm755 "$pkgdir/var/log/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"
+}
+
+sha256sums=('78c87f600878a6cab41c1d447f6a40b25892a59f8fb49da11392a682884fb8df'
+            '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb'
+            'e3dd705bec204b8572456344b90c4773f867965a1215c22b6e9518f0aa268a2d'
+            '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f')

Deleted: community-x86_64/elasticsearch-tmpfile.conf
===================================================================
--- community-x86_64/elasticsearch-tmpfile.conf	2014-01-29 16:44:18 UTC (rev 104998)
+++ community-x86_64/elasticsearch-tmpfile.conf	2014-01-29 16:48:56 UTC (rev 104999)
@@ -1 +0,0 @@
-d /run/elasticsearch 0755 elasticsearch elasticsearch -
\ No newline at end of file

Copied: elasticsearch/repos/community-x86_64/elasticsearch-tmpfile.conf (from rev 104998, elasticsearch/trunk/elasticsearch-tmpfile.conf)
===================================================================
--- community-x86_64/elasticsearch-tmpfile.conf	                        (rev 0)
+++ community-x86_64/elasticsearch-tmpfile.conf	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1 @@
+d /run/elasticsearch 0755 elasticsearch elasticsearch -
\ No newline at end of file

Deleted: community-x86_64/elasticsearch.install
===================================================================
--- community-x86_64/elasticsearch.install	2014-01-29 16:44:18 UTC (rev 104998)
+++ community-x86_64/elasticsearch.install	2014-01-29 16:48:56 UTC (rev 104999)
@@ -1,24 +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
-
-    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
-    chown -R elasticsearch:elasticsearch /var/lib/elasticsearch
-    chown -R elasticsearch:elasticsearch /var/log/elasticsearch
-
-    usr/bin/systemd-tmpfiles --create elasticsearch.conf
-}
-
-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
-}
-
-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 104998, elasticsearch/trunk/elasticsearch.install)
===================================================================
--- community-x86_64/elasticsearch.install	                        (rev 0)
+++ community-x86_64/elasticsearch.install	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1,24 @@
+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
+
+    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
+    chown -R elasticsearch:elasticsearch /var/lib/elasticsearch
+    chown -R elasticsearch:elasticsearch /var/log/elasticsearch
+
+    usr/bin/systemd-tmpfiles --create elasticsearch.conf
+}
+
+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
+}
+
+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-01-29 16:44:18 UTC (rev 104998)
+++ community-x86_64/elasticsearch.service	2014-01-29 16:48:56 UTC (rev 104999)
@@ -1,13 +0,0 @@
-[Unit]
-Description=ElasticSearch
-After=network.target
-
-[Service]
-User=elasticsearch
-Type=forking
-PIDFile=/run/elasticsearch/elasticsearch.pid
-ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

Copied: elasticsearch/repos/community-x86_64/elasticsearch.service (from rev 104998, elasticsearch/trunk/elasticsearch.service)
===================================================================
--- community-x86_64/elasticsearch.service	                        (rev 0)
+++ community-x86_64/elasticsearch.service	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1,13 @@
+[Unit]
+Description=ElasticSearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Type=forking
+PIDFile=/run/elasticsearch/elasticsearch.pid
+ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

Copied: elasticsearch/repos/community-x86_64/elasticsearch at .service (from rev 104998, elasticsearch/trunk/elasticsearch at .service)
===================================================================
--- community-x86_64/elasticsearch at .service	                        (rev 0)
+++ community-x86_64/elasticsearch at .service	2014-01-29 16:48:56 UTC (rev 104999)
@@ -0,0 +1,13 @@
+[Unit]
+Description=ElasticSearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Type=forking
+PIDFile=/run/elasticsearch/%I.pid
+ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target




More information about the arch-commits mailing list