diff options
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/elasticsearch/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/elasticsearch/elasticsearch-2.4.4.ebuild (renamed from app-misc/elasticsearch/elasticsearch-2.4.3.ebuild) | 1 | ||||
| -rw-r--r-- | app-misc/elasticsearch/elasticsearch-5.1.2.ebuild (renamed from app-misc/elasticsearch/elasticsearch-5.1.1.ebuild) | 2 | ||||
| -rw-r--r-- | app-misc/elasticsearch/files/elasticsearch.init6 | 1 | ||||
| -rw-r--r-- | app-misc/elasticsearch/files/elasticsearch.service6 | 53 |
5 files changed, 57 insertions, 4 deletions
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest index 2f1dc70955a1..f12537168d88 100644 --- a/app-misc/elasticsearch/Manifest +++ b/app-misc/elasticsearch/Manifest @@ -1,2 +1,2 @@ -DIST elasticsearch-2.4.3.tar.gz 27342693 SHA256 01eb684943be01d4af3131c6795073187b1a5868b6525d9686cc0d7a315db12e SHA512 357a145050ba155d60239f0127e8b772705efcddc9246492d80792c65c613f82a87dd4e4ea4a36c9555a0b5a536a34e2168d57c5b851c36f042f9a52ab3e24a8 WHIRLPOOL 07cd05120ac3bb15cd65b29caca6cc847f0e21cae7ff9a1d1002bcb66a54334c85cfc739e05d8452ba128fb3bdecb6c6cc4726e498f4c9e4e7cb8995c7ea7c2b -DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6 +DIST elasticsearch-2.4.4.tar.gz 27343272 SHA256 981092e6ca65ba5560b8b97a74e5ed0eb2236e9128efdb85bb652cec340158e2 SHA512 899a4d2fc64548bcd488ece223f5f189dfb191eceb36390c4b9d8d0d90ef9d2cb67ada475223b9b2e0bd0fb521a4ab978bc7f60781195927e36d027925338c14 WHIRLPOOL 1a90bb8c923a9eab6cc4390b3daaa44cd85d5c1a3a1a5ef7d274050eb25b061a11a91b0f57ebe9f3cb27aafee3267af8f63ca87837f79d622ff362fbc5b6ae1a +DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e diff --git a/app-misc/elasticsearch/elasticsearch-2.4.3.ebuild b/app-misc/elasticsearch/elasticsearch-2.4.4.ebuild index 57a8b23eb590..f3901ac933b1 100644 --- a/app-misc/elasticsearch/elasticsearch-2.4.3.ebuild +++ b/app-misc/elasticsearch/elasticsearch-2.4.4.ebuild @@ -36,7 +36,6 @@ src_prepare() { src_install() { keepdir /etc/${PN} - dodir /etc/${PN}/scripts insinto /etc/${PN} doins config/* diff --git a/app-misc/elasticsearch/elasticsearch-5.1.1.ebuild b/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild index 45059715f601..1d57516b9fa8 100644 --- a/app-misc/elasticsearch/elasticsearch-5.1.1.ebuild +++ b/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild @@ -60,7 +60,7 @@ src_install() { newinitd "${FILESDIR}/${PN}.init7" "${PN}" newconfd "${FILESDIR}/${PN}.conf3" "${PN}" - systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service" + systemd_newunit "${FILESDIR}"/${PN}.service6 "${PN}.service" } pkg_postinst() { diff --git a/app-misc/elasticsearch/files/elasticsearch.init6 b/app-misc/elasticsearch/files/elasticsearch.init6 index 9b11ed61db9d..e3252c55c676 100644 --- a/app-misc/elasticsearch/files/elasticsearch.init6 +++ b/app-misc/elasticsearch/files/elasticsearch.init6 @@ -82,6 +82,7 @@ start() { checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${PID_DIR}" checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}" checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}" + checkpath -d -o root:root -m755 "${CONF_DIR}/scripts" start-stop-daemon --start \ --background \ diff --git a/app-misc/elasticsearch/files/elasticsearch.service6 b/app-misc/elasticsearch/files/elasticsearch.service6 new file mode 100644 index 000000000000..927acef5ee88 --- /dev/null +++ b/app-misc/elasticsearch/files/elasticsearch.service6 @@ -0,0 +1,53 @@ +[Unit] +Description=Elasticsearch +Documentation=http://www.elastic.co +Wants=network.target +After=network.target + +[Service] +Environment=ES_HOME=/usr/share/elasticsearch +Environment=CONF_DIR=/etc/elasticsearch +Environment=DATA_DIR=/var/lib/elasticsearch +Environment=LOG_DIR=/var/log/elasticsearch +Environment=PID_DIR=/run/elasticsearch +EnvironmentFile=-/etc/conf.d/elasticsearch + +WorkingDirectory=/usr/share/elasticsearch + +User=elasticsearch +Group=elasticsearch + +ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec + +ExecStart=/usr/share/elasticsearch/bin/elasticsearch \ + -p ${PID_DIR}/elasticsearch.pid \ + -Edefault.path.home=${ES_HOME} \ + -Edefault.path.logs=${LOG_DIR} \ + -Edefault.path.data=${DATA_DIR} \ + -Edefault.path.conf=${CONF_DIR} + +StandardOutput=journal +StandardError=inherit + +# Specifies the maximum file descriptor number that can be opened by this process +LimitNOFILE=65536 + +# Specifies the maximum number of bytes of memory that may be locked into RAM +# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option +# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch +#LimitMEMLOCK=infinity + +# Disable timeout logic and wait until process is stopped +TimeoutStopSec=0 + +# SIGTERM signal is used to stop the Java process +KillSignal=SIGTERM + +# Java process is never killed +SendSIGKILL=no + +# When a JVM receives a SIGTERM signal it exits with code 143 +SuccessExitStatus=143 + +[Install] +WantedBy=multi-user.target |