[arch-commits] Commit in elasticsearch/repos (28 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Wed Jul 23 21:31:20 UTC 2014
Date: Wednesday, July 23, 2014 @ 23:31:20
Author: mtorromeo
Revision: 116201
archrelease: copy trunk to community-i686, community-x86_64
Added:
elasticsearch/repos/community-i686/PKGBUILD
(from rev 116200, elasticsearch/trunk/PKGBUILD)
elasticsearch/repos/community-i686/elasticsearch-sysctl.conf
(from rev 116200, elasticsearch/trunk/elasticsearch-sysctl.conf)
elasticsearch/repos/community-i686/elasticsearch-tmpfile.conf
(from rev 116200, elasticsearch/trunk/elasticsearch-tmpfile.conf)
elasticsearch/repos/community-i686/elasticsearch.default
(from rev 116200, elasticsearch/trunk/elasticsearch.default)
elasticsearch/repos/community-i686/elasticsearch.install
(from rev 116200, elasticsearch/trunk/elasticsearch.install)
elasticsearch/repos/community-i686/elasticsearch.service
(from rev 116200, elasticsearch/trunk/elasticsearch.service)
elasticsearch/repos/community-i686/elasticsearch at .service
(from rev 116200, elasticsearch/trunk/elasticsearch at .service)
elasticsearch/repos/community-x86_64/PKGBUILD
(from rev 116200, elasticsearch/trunk/PKGBUILD)
elasticsearch/repos/community-x86_64/elasticsearch-sysctl.conf
(from rev 116200, elasticsearch/trunk/elasticsearch-sysctl.conf)
elasticsearch/repos/community-x86_64/elasticsearch-tmpfile.conf
(from rev 116200, elasticsearch/trunk/elasticsearch-tmpfile.conf)
elasticsearch/repos/community-x86_64/elasticsearch.default
(from rev 116200, elasticsearch/trunk/elasticsearch.default)
elasticsearch/repos/community-x86_64/elasticsearch.install
(from rev 116200, elasticsearch/trunk/elasticsearch.install)
elasticsearch/repos/community-x86_64/elasticsearch.service
(from rev 116200, elasticsearch/trunk/elasticsearch.service)
elasticsearch/repos/community-x86_64/elasticsearch at .service
(from rev 116200, elasticsearch/trunk/elasticsearch at .service)
Deleted:
elasticsearch/repos/community-i686/PKGBUILD
elasticsearch/repos/community-i686/elasticsearch-sysctl.conf
elasticsearch/repos/community-i686/elasticsearch-user.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-user.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 | 168 ++++++++++++++++++++++++++
/elasticsearch-sysctl.conf | 2
/elasticsearch.default | 22 +++
/elasticsearch.install | 46 +++++++
/elasticsearch.service | 40 ++++++
/elasticsearch at .service | 40 ++++++
community-i686/PKGBUILD | 85 -------------
community-i686/elasticsearch-sysctl.conf | 1
community-i686/elasticsearch-tmpfile.conf | 2
community-i686/elasticsearch-user.conf | 3
community-i686/elasticsearch.default | 11 -
community-i686/elasticsearch.install | 17 --
community-i686/elasticsearch.service | 22 ---
community-i686/elasticsearch at .service | 22 ---
community-x86_64/PKGBUILD | 85 -------------
community-x86_64/elasticsearch-sysctl.conf | 1
community-x86_64/elasticsearch-tmpfile.conf | 2
community-x86_64/elasticsearch-user.conf | 3
community-x86_64/elasticsearch.default | 11 -
community-x86_64/elasticsearch.install | 17 --
community-x86_64/elasticsearch.service | 22 ---
community-x86_64/elasticsearch at .service | 22 ---
22 files changed, 322 insertions(+), 322 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-i686/PKGBUILD 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,85 +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.2.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' 'bash' 'systemd')
-install='elasticsearch.install'
-source=(
- "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
- elasticsearch.service
- elasticsearch at .service
- elasticsearch-user.conf
- elasticsearch-sysctl.conf
- elasticsearch.default
-)
-
-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
-
- 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 -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-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
-}
-
-sha256sums=('c833d000c7e29e17b4cc5df2e26020c159ee086cdf4ac19f661911cc9aedfbee'
- '4b7c741c2fa2f856cff6b9e83693c2de9d8c00a73812b34133b4446bdcb2e4c8'
- '0c6969af1ab91fc543d4c37fea8f3596872a143281c22a17801703490758ba0a'
- '51a5ebf06f8853b4b4cbf1b13320dd738a82e9f2caab47ca772f157a6bd78063'
- 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
- 'a0ee0761156a02d3f79db5ef295613c1a6d4267482c8db889d92a94b59feb497')
Copied: elasticsearch/repos/community-i686/PKGBUILD (from rev 116200, elasticsearch/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,84 @@
+# $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.0
+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' '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=('4e2cf72d4ceaaf250a292c00a320d13d2fdb067ad8aeed969862db3060af4534'
+ 'f3a6e5b968ffe38edc42c80193f75ab1682a5224c977c8957816d321733aabc4'
+ 'c3ea4d82da44da8ea9bcb4d7d9cdfb086d25fd8ec2ea457adec290f0d6ebe083'
+ 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
+ '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9'
+ 'a0ee0761156a02d3f79db5ef295613c1a6d4267482c8db889d92a94b59feb497')
+
+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
+
+ 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 -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
+}
Deleted: community-i686/elasticsearch-sysctl.conf
===================================================================
--- community-i686/elasticsearch-sysctl.conf 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-i686/elasticsearch-sysctl.conf 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1 +0,0 @@
-vm.max_map_count=262144
\ No newline at end of file
Copied: elasticsearch/repos/community-i686/elasticsearch-sysctl.conf (from rev 116200, elasticsearch/trunk/elasticsearch-sysctl.conf)
===================================================================
--- community-i686/elasticsearch-sysctl.conf (rev 0)
+++ community-i686/elasticsearch-sysctl.conf 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1 @@
+vm.max_map_count=262144
\ No newline at end of file
Copied: elasticsearch/repos/community-i686/elasticsearch-tmpfile.conf (from rev 116200, elasticsearch/trunk/elasticsearch-tmpfile.conf)
===================================================================
--- community-i686/elasticsearch-tmpfile.conf (rev 0)
+++ community-i686/elasticsearch-tmpfile.conf 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,2 @@
+d /var/log/elasticsearch 0755 elasticsearch elasticsearch -
+d /var/lib/elasticsearch 0755 elasticsearch elasticsearch -
Deleted: community-i686/elasticsearch-user.conf
===================================================================
--- community-i686/elasticsearch-user.conf 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-i686/elasticsearch-user.conf 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,3 +0,0 @@
-u elasticsearch 114 "Elasticsearch user"
-g elasticsearch 114
-m elasticsearch elasticsearch
Deleted: community-i686/elasticsearch.default
===================================================================
--- community-i686/elasticsearch.default 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-i686/elasticsearch.default 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,11 +0,0 @@
-# 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 116200, elasticsearch/trunk/elasticsearch.default)
===================================================================
--- community-i686/elasticsearch.default (rev 0)
+++ community-i686/elasticsearch.default 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,11 @@
+# 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-07-23 21:30:54 UTC (rev 116200)
+++ community-i686/elasticsearch.install 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,17 +0,0 @@
-post_install() {
- systemd-sysusers elasticsearch.conf
- chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
-}
-
-post_upgrade(){
- systemd-sysusers 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 116200, elasticsearch/trunk/elasticsearch.install)
===================================================================
--- community-i686/elasticsearch.install (rev 0)
+++ community-i686/elasticsearch.install 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,23 @@
+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
+}
Deleted: community-i686/elasticsearch.service
===================================================================
--- community-i686/elasticsearch.service 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-i686/elasticsearch.service 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,22 +0,0 @@
-[Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
-After=network.target
-
-[Service]
-Type=forking
-User=elasticsearch
-Group=elasticsearch
-ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/lib/elasticsearch
-ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/log/elasticsearch
-ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid
-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 116200, elasticsearch/trunk/elasticsearch.service)
===================================================================
--- community-i686/elasticsearch.service (rev 0)
+++ community-i686/elasticsearch.service 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,20 @@
+[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
+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-07-23 21:30:54 UTC (rev 116200)
+++ community-i686/elasticsearch at .service 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,22 +0,0 @@
-[Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
-After=network.target
-
-[Service]
-Type=forking
-User=elasticsearch
-Group=elasticsearch
-ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/lib/elasticsearch
-ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/log/elasticsearch
-ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml
-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 116200, elasticsearch/trunk/elasticsearch at .service)
===================================================================
--- community-i686/elasticsearch at .service (rev 0)
+++ community-i686/elasticsearch at .service 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,20 @@
+[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
+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-07-23 21:30:54 UTC (rev 116200)
+++ community-x86_64/PKGBUILD 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,85 +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.2.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' 'bash' 'systemd')
-install='elasticsearch.install'
-source=(
- "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
- elasticsearch.service
- elasticsearch at .service
- elasticsearch-user.conf
- elasticsearch-sysctl.conf
- elasticsearch.default
-)
-
-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
-
- 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 -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-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
-}
-
-sha256sums=('c833d000c7e29e17b4cc5df2e26020c159ee086cdf4ac19f661911cc9aedfbee'
- '4b7c741c2fa2f856cff6b9e83693c2de9d8c00a73812b34133b4446bdcb2e4c8'
- '0c6969af1ab91fc543d4c37fea8f3596872a143281c22a17801703490758ba0a'
- '51a5ebf06f8853b4b4cbf1b13320dd738a82e9f2caab47ca772f157a6bd78063'
- 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
- 'a0ee0761156a02d3f79db5ef295613c1a6d4267482c8db889d92a94b59feb497')
Copied: elasticsearch/repos/community-x86_64/PKGBUILD (from rev 116200, elasticsearch/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,84 @@
+# $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.0
+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' '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=('4e2cf72d4ceaaf250a292c00a320d13d2fdb067ad8aeed969862db3060af4534'
+ 'f3a6e5b968ffe38edc42c80193f75ab1682a5224c977c8957816d321733aabc4'
+ 'c3ea4d82da44da8ea9bcb4d7d9cdfb086d25fd8ec2ea457adec290f0d6ebe083'
+ 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
+ '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9'
+ 'a0ee0761156a02d3f79db5ef295613c1a6d4267482c8db889d92a94b59feb497')
+
+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
+
+ 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 -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
+}
Deleted: community-x86_64/elasticsearch-sysctl.conf
===================================================================
--- community-x86_64/elasticsearch-sysctl.conf 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-x86_64/elasticsearch-sysctl.conf 2014-07-23 21:31:20 UTC (rev 116201)
@@ -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 116200, elasticsearch/trunk/elasticsearch-sysctl.conf)
===================================================================
--- community-x86_64/elasticsearch-sysctl.conf (rev 0)
+++ community-x86_64/elasticsearch-sysctl.conf 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1 @@
+vm.max_map_count=262144
\ No newline at end of file
Copied: elasticsearch/repos/community-x86_64/elasticsearch-tmpfile.conf (from rev 116200, elasticsearch/trunk/elasticsearch-tmpfile.conf)
===================================================================
--- community-x86_64/elasticsearch-tmpfile.conf (rev 0)
+++ community-x86_64/elasticsearch-tmpfile.conf 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,2 @@
+d /var/log/elasticsearch 0755 elasticsearch elasticsearch -
+d /var/lib/elasticsearch 0755 elasticsearch elasticsearch -
Deleted: community-x86_64/elasticsearch-user.conf
===================================================================
--- community-x86_64/elasticsearch-user.conf 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-x86_64/elasticsearch-user.conf 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,3 +0,0 @@
-u elasticsearch 114 "Elasticsearch user"
-g elasticsearch 114
-m elasticsearch elasticsearch
Deleted: community-x86_64/elasticsearch.default
===================================================================
--- community-x86_64/elasticsearch.default 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-x86_64/elasticsearch.default 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,11 +0,0 @@
-# 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 116200, elasticsearch/trunk/elasticsearch.default)
===================================================================
--- community-x86_64/elasticsearch.default (rev 0)
+++ community-x86_64/elasticsearch.default 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,11 @@
+# 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-07-23 21:30:54 UTC (rev 116200)
+++ community-x86_64/elasticsearch.install 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,17 +0,0 @@
-post_install() {
- systemd-sysusers elasticsearch.conf
- chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
-}
-
-post_upgrade(){
- systemd-sysusers 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 116200, elasticsearch/trunk/elasticsearch.install)
===================================================================
--- community-x86_64/elasticsearch.install (rev 0)
+++ community-x86_64/elasticsearch.install 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,23 @@
+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
+}
Deleted: community-x86_64/elasticsearch.service
===================================================================
--- community-x86_64/elasticsearch.service 2014-07-23 21:30:54 UTC (rev 116200)
+++ community-x86_64/elasticsearch.service 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,22 +0,0 @@
-[Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
-After=network.target
-
-[Service]
-Type=forking
-User=elasticsearch
-Group=elasticsearch
-ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/lib/elasticsearch
-ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/log/elasticsearch
-ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid
-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 116200, elasticsearch/trunk/elasticsearch.service)
===================================================================
--- community-x86_64/elasticsearch.service (rev 0)
+++ community-x86_64/elasticsearch.service 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,20 @@
+[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
+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-07-23 21:30:54 UTC (rev 116200)
+++ community-x86_64/elasticsearch at .service 2014-07-23 21:31:20 UTC (rev 116201)
@@ -1,22 +0,0 @@
-[Unit]
-Description=ElasticSearch
-Documentation=http://www.elasticsearch.org
-After=network.target
-
-[Service]
-Type=forking
-User=elasticsearch
-Group=elasticsearch
-ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/lib/elasticsearch
-ExecStartPre=-/usr/bin/install -o elasticsearch -g elasticsearch -d /var/log/elasticsearch
-ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml
-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 116200, elasticsearch/trunk/elasticsearch at .service)
===================================================================
--- community-x86_64/elasticsearch at .service (rev 0)
+++ community-x86_64/elasticsearch at .service 2014-07-23 21:31:20 UTC (rev 116201)
@@ -0,0 +1,20 @@
+[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
+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