Date: Wednesday, July 9, 2014 @ 15:41:15 Author: mtorromeo Revision: 115376
upgpkg: elasticsearch 1.2.2-1 Updated to 1.2.2 and improved systemd service to handle ES environment variables and runtime, data and log directories Modified: elasticsearch/trunk/PKGBUILD elasticsearch/trunk/elasticsearch.install elasticsearch/trunk/elasticsearch.service elasticsearch/trunk/[email protected] ------------------------+ PKGBUILD | 31 ++++++++++++++++--------------- elasticsearch.install | 4 ---- elasticsearch.service | 10 ++++++++-- [email protected] | 10 ++++++++-- 4 files changed, 32 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-07-09 13:28:03 UTC (rev 115375) +++ PKGBUILD 2014-07-09 13:41:15 UTC (rev 115376) @@ -4,7 +4,7 @@ # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer> pkgname=elasticsearch -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="Distributed RESTful search engine built on top of Lucene" arch=('i686' 'x86_64') @@ -16,12 +16,13 @@ "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"; elasticsearch.service [email protected] - elasticsearch-tmpfile.conf elasticsearch-sysctl.conf + elasticsearch.default ) backup=('etc/elasticsearch/elasticsearch.yml' - 'etc/elasticsearch/logging.yml') + 'etc/elasticsearch/logging.yml' + 'etc/default/elasticsearch') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -40,10 +41,10 @@ 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/' \ + 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 } @@ -50,8 +51,6 @@ 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" @@ -70,12 +69,14 @@ install -Dm644 "$srcdir/elasticsearch.service" "$pkgdir/usr/lib/systemd/system/elasticsearch.service" install -Dm644 "$srcdir/[email protected]" "$pkgdir/usr/lib/systemd/system/[email protected]" - 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" } -sha256sums=('b2b270de2b520b4a2510454c75d3a6b9a9801b7d9a31754a731d2c0868cf9186' - 'ab13ccda28bf90a10b570e095afc47ddef68da7e45546b2d45e74722c9095f0a' - 'a04ac09172158611a03dda096b670fe6586ae11b6b3d4de7965ed2b90cb3319f' - '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f' - 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c') +sha256sums=('c833d000c7e29e17b4cc5df2e26020c159ee086cdf4ac19f661911cc9aedfbee' + '4b7c741c2fa2f856cff6b9e83693c2de9d8c00a73812b34133b4446bdcb2e4c8' + '0c6969af1ab91fc543d4c37fea8f3596872a143281c22a17801703490758ba0a' + 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c' + 'a0ee0761156a02d3f79db5ef295613c1a6d4267482c8db889d92a94b59feb497') Modified: elasticsearch.install =================================================================== --- elasticsearch.install 2014-07-09 13:28:03 UTC (rev 115375) +++ elasticsearch.install 2014-07-09 13:41:15 UTC (rev 115376) @@ -3,10 +3,6 @@ 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(){ Modified: elasticsearch.service =================================================================== --- elasticsearch.service 2014-07-09 13:28:03 UTC (rev 115375) +++ elasticsearch.service 2014-07-09 13:41:15 UTC (rev 115376) @@ -4,11 +4,17 @@ After=network.target [Service] +Type=forking User=elasticsearch -Type=forking +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 -ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid LimitNOFILE=65535 +LimitMEMLOCK=infinity TimeoutStopSec=20 Restart=on-failure Modified: [email protected] =================================================================== --- [email protected] 2014-07-09 13:28:03 UTC (rev 115375) +++ [email protected] 2014-07-09 13:41:15 UTC (rev 115376) @@ -4,11 +4,17 @@ After=network.target [Service] +Type=forking User=elasticsearch -Type=forking +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 -ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml LimitNOFILE=65535 +LimitMEMLOCK=infinity TimeoutStopSec=20 Restart=on-failure
