diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-misc/elasticsearch | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'app-misc/elasticsearch')
-rw-r--r-- | app-misc/elasticsearch/Manifest | 13 | ||||
-rw-r--r-- | app-misc/elasticsearch/elasticsearch-6.8.15.ebuild (renamed from app-misc/elasticsearch/elasticsearch-6.8.14.ebuild) | 0 | ||||
-rw-r--r-- | app-misc/elasticsearch/elasticsearch-7.12.0.ebuild (renamed from app-misc/elasticsearch/elasticsearch-7.9.3.ebuild) | 21 | ||||
-rw-r--r-- | app-misc/elasticsearch/files/elasticsearch.conf.4 | 62 | ||||
-rw-r--r-- | app-misc/elasticsearch/files/elasticsearch.init.8 | 70 |
5 files changed, 147 insertions, 19 deletions
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest index 10b4e46e27e7..02f582e14536 100644 --- a/app-misc/elasticsearch/Manifest +++ b/app-misc/elasticsearch/Manifest @@ -1,18 +1,19 @@ AUX elasticsearch-systemd-pre-exec 369 BLAKE2B 18fae13aa27931cfc3952309ab76847790f4f785d14efa93bb24cfa66b3b0fc655c19a17d5a7a1b431b6c037cf3596a04eed8f650cf51beb1917560e8817bd2d SHA512 fae1d6e4e52df7d0d3111d6d6bbddf12182de931d461669d8784b524e5671ad40fb645dc6a6cf3de0de08f032c0327da8b25d7cbc4c4a49e3e3a7a791c6cfcdd AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49 +AUX elasticsearch.conf.4 2199 BLAKE2B 0cc66acdc8ce76c4eba04e5fdb745d740bca2a1941535be054e99c33a208e0229609c0106b7f91c9a9f28c22ae8ebb73951dfe36fe2ca0ae51732f5fa1707a34 SHA512 91af72bf5272ed6152835c5e34408fa9e7245b09864613cd59c08da977d9130dbfe664d6aa6f11eac2ce07ebfdb3599e9f27ff219595f6d515c2c06f11f637bd AUX elasticsearch.init.6 2102 BLAKE2B e49581ac65b20feb24711674a2f5f46bc67d65cd8e5128f1d0868a84db36b0067b13ae39ea3f57d0b4c8ebfd91fb3d769088c29dacf8436beb66fe98cea0b03e SHA512 52116a49c9bce9ebe57316f96f3b6eff3a6bd544b930845d5fb9b74fc5f40535a0e50d71f8c7e602fbe8935ec35692b763a5255ad43afac5f7ac8ac00ba2bd30 AUX elasticsearch.init.7 2158 BLAKE2B 934840e6013bca18282ceb6566bfe4fa9480a72a458bf1fc0566f4651e9e749ee9ff90f3bac2fd1cb75c5f7a3e91842a751af00b6245292600ad56060318a8ec SHA512 b847b089c18ec10892c395017a15f1f6e5af42055b11252219c832877f3f5d6c78988af85eeaf671fdfd9a7155ce19ea8e16f70bfe86c4453ea0174908eec520 +AUX elasticsearch.init.8 2150 BLAKE2B 6187331fba1933ddf5fc967d77e818305c6719a838fc6fdac5b821fb2dd659eef3993ca88105b2c30eabf5c2185f3cdae9a58000134c0599a8219ea8933ba532 SHA512 91e7fb2d2eb4a2c85246daa30a28a5eae48972eec5fbae52f16c58ef432c1fabc415e0690052869c70ccc4b6b2a75a228e5aef4b5ee934bc0fb4d00d48303fe3 AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a -DIST elasticsearch-6.8.14.tar.gz 149098495 BLAKE2B f1ccfcd9647a3584594a9db78f92488bc6bd5fe403c9b2cdff9001b87168136817084ce28eb8f14c6e54dd75b88118cf0eb6993e5502e74ecf826938f4c2ff57 SHA512 d7ca05707b9e3d8de19aaebc7811891a82897b2407f3de27ac95b2aad0d6669217c741e14bf768c3ea963977e3fa2ecc2f6d297aeafe985db52f6eb6780912b7 +DIST elasticsearch-6.8.15.tar.gz 149102328 BLAKE2B 0ce9ba565d751cd27721f3d49dd24761937c3476cee4896ba1a4d84e4fc238296129481f18cad64270fe8af71a043c2e8e583df14f2a084850fb10c93fcea0ef SHA512 c62c4d9d1bb83e10d3e1079f56b834f2f89b1f712c29d9ce7e81786199c71d287ecbf6df158eca56a7af711eafe13dfb276e12b34e1a0a6cf6719e1fbb44a142 DIST elasticsearch-7.10.2-no-jdk-linux-x86_64.tar.gz 164380146 BLAKE2B 16797ed48c4cb6f91ed891014f275ad86a4852579232df1827413389fc9e505327412729f70783750252190a34b0e0d552ec0b5f25f3d0a811724191eccc6568 SHA512 bd3def00af04670ad04556c911ef8c68b639e1c3b621f36a8973d9700f95873d10bc706a4e3a98f892ac59c1b761d56035a236068d6958af772874e428940dc4 -DIST elasticsearch-7.9.3-no-jdk-linux-x86_64.tar.gz 162808745 BLAKE2B e6a12ec3cc3bec0bdf8dd10680dd86214bf619b1abfdfeb8524b0b0f50a0f1faaf03b13f06ab62055f80c7987dd04b0dd9f2beba16dd59a5d346fc6cceb51acd SHA512 fea21591edc790b9d5c48151619921085d1b0e5dad1f8c43efbd44a58babeb8bfad52f4329f1f34c71d47618e24d7320c0e591f8eb65d15c2b9c3e1492d91680 -DIST elasticsearch-oss-6.8.14.tar.gz 68236681 BLAKE2B 09c6c23517b880ee1afb1c3472d4518172927c226386c7d0f2f5b9312e7de236bd6fa7d527b949e3cace759af6a1fdfe7d72f1ccf8e2c6e15919c4c8c989ee9e SHA512 c0372969ec9e5f7aff551bc0aa13684fdaccd5a553e8ee896979488ab2f13181642222ab4eca4dc799181bce1405200b5aea4866c830483ce1e484fa6a714998 +DIST elasticsearch-7.12.0-no-jdk-linux-x86_64.tar.gz 173069694 BLAKE2B 5de74b1e6de743246cf48e32254f9646fa25c2820d0be9df886fdefe131a302ddb8906546147f0d284e2fc0faf8cc0238bf854fe1611d28bf1e7cb1518bd4e31 SHA512 205aa2a2fa2ab7eb7b54087420e0123aa97e5456e2e1f31cad9ea7b84be3f9823a2a7c47d4cf1697833e5f795359477d3a3b0ea4955a8f92583cf2228071827e +DIST elasticsearch-oss-6.8.15.tar.gz 68240776 BLAKE2B 431d845e02f2118a98021af4422ece34274b6d0811a32c5a3e679da3f8f56ca9cd45949307268811edbb83327a4a80fb84866cbbaaf01f7d3af042412b1e1bfa SHA512 7e6a819339ac6043af218f9d97d5d68c50ac46900e4293e7fa18992f7a50b10b0ab2434e26ff0dc1546204ae7526de8ac6ef6545fc0db9c862ceeaa0d96c56f5 DIST elasticsearch-oss-7.10.2-no-jdk-linux-x86_64.tar.gz 76383466 BLAKE2B e99c04b0d10ef5755986515c7127ebde00b58e0eba69b6a05e12bd0bffee70266bbb023680584bfe0f321d5a3cf79af89cce3a5191923ad721a9f6039ab82743 SHA512 7b63237996569ccdc7c9d9e7cc097fcb23865396eddac30e5f02543484220d2fc70a7285b430877e5e76a5d8716d9682de9fc40d5e57a08f331e82011fc59756 -DIST elasticsearch-oss-7.9.3-no-jdk-linux-x86_64.tar.gz 75609441 BLAKE2B 5c638426c4fd64b877b350a6845da5d771e7ea222af245d50d9361ae27193e1ade555a060493b1ec056bd273d37656c37a11445b73866dc5347cd608a9d3333b SHA512 679d02f2576aa04aefee6ab1b8922d20d9fc1606c2454b32b52e7377187435da50566c9000565df8496ae69d0882724fbf2877b8253bd6036c06367e854c55f6 -EBUILD elasticsearch-6.8.14.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f +EBUILD elasticsearch-6.8.15.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f EBUILD elasticsearch-7.10.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc -EBUILD elasticsearch-7.9.3.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc +EBUILD elasticsearch-7.12.0.ebuild 2295 BLAKE2B 79ba465b21d2feee5c481eab2e0feb870bcda696d0ff2375fe49e75a8d7c6ebd040fe1fbca764bb61a8b8116d11a18a609dc230e794cb045aca70dba652b9b82 SHA512 57988aaeed4b5b0c6a3251e9bf7e5b13a07cd766710a8baf9c753beb8f7b16e3e18d8c9988f6c880afa76eb13ee2cae4afeda6b8d916f09a6d9fce8a5ab16bbc MISC metadata.xml 611 BLAKE2B 91d02c98271689922fc5d79355a378cb29a3c88e45b089ad89afb182e50f6a0bb19fa8160e2455eb8815e9b2655cea6232ba7845cfa970b4d82529993b5447b8 SHA512 daa5f2349a139c5952f9831c9517e6af48ebe337506f77e7ddbe67fc5ad6f243ecea82c858b7687e3baef26f20e1e3f0d2453f72ce00a5985c2a618dff2a6361 diff --git a/app-misc/elasticsearch/elasticsearch-6.8.14.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild index 6b347e7957c4..6b347e7957c4 100644 --- a/app-misc/elasticsearch/elasticsearch-6.8.14.ebuild +++ b/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild diff --git a/app-misc/elasticsearch/elasticsearch-7.9.3.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild index 826ad97256df..1eba30da241b 100644 --- a/app-misc/elasticsearch/elasticsearch-7.9.3.ebuild +++ b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild @@ -1,18 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit systemd tmpfiles -DESCRIPTION="Open Source, Distributed, RESTful, Search Engine" -HOMEPAGE="https://www.elastic.co/products/elasticsearch" -SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz ) - !x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )" -LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )" +DESCRIPTION="Free and Open, Distributed, RESTful Search Engine" +HOMEPAGE="https://www.elastic.co/elasticsearch/" +SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz" +LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain" SLOT="0" KEYWORDS="~amd64" -IUSE="x-pack" RDEPEND="acct-group/elasticsearch acct-user/elasticsearch @@ -45,10 +43,7 @@ src_install() { doexe "${FILESDIR}/elasticsearch-systemd-pre-exec" fperms -R +x /usr/share/${PN}/bin - - if use x-pack; then - fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin - fi + fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin keepdir /var/{lib,log}/${PN} fowners ${PN}:${PN} /var/{lib,log}/${PN} @@ -58,8 +53,8 @@ src_install() { insinto /etc/sysctl.d newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf - newconfd "${FILESDIR}/${PN}.conf.3" ${PN} - newinitd "${FILESDIR}/${PN}.init.7" ${PN} + newconfd "${FILESDIR}/${PN}.conf.4" ${PN} + newinitd "${FILESDIR}/${PN}.init.8" ${PN} systemd_install_serviced "${FILESDIR}/${PN}.service.conf" systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.4 b/app-misc/elasticsearch/files/elasticsearch.conf.4 new file mode 100644 index 000000000000..a76bc5b7be38 --- /dev/null +++ b/app-misc/elasticsearch/files/elasticsearch.conf.4 @@ -0,0 +1,62 @@ +################################ +# Elasticsearch +################################ + +# Elasticsearch home directory +#ES_HOME=/usr/share/elasticsearch + +# Elasticsearch Java path +#ES_JAVA_HOME= + +# Elasticsearch configuration directory +#CONF_DIR=/etc/elasticsearch + +# Elasticsearch data directory +#DATA_DIR=/var/lib/elasticsearch + +# Elasticsearch logs directory +#LOG_DIR=/var/log/elasticsearch + +# Additional Java OPTS +#ES_JAVA_OPTS= + +################################ +# Elasticsearch service +################################ + +# When executing the init script, this user will be used to run the elasticsearch service. +# The default value is 'elasticsearch' and is declared in the init.d file. +# Note that this setting is only used by the init script. If changed, make sure that +# the configured user can read and write into the data, work, plugins and log directories. +# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service +#ES_USER=elasticsearch +#ES_GROUP=elasticsearch + +# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process +#ES_STARTUP_SLEEP_TIME=5 + +################################ +# System properties +################################ + +# Specifies the maximum file descriptor number that can be opened by this process +# When using Systemd, this setting is ignored and the LimitNOFILE defined in +# /usr/lib/systemd/system/elasticsearch.service takes precedence +MAX_OPEN_FILES=65536 + +# The maximum number of bytes of memory that may be locked into RAM +# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option +# in elasticsearch.yml. +# When using Systemd, the LimitMEMLOCK property must be set +# in /usr/lib/systemd/system/elasticsearch.service +MAX_LOCKED_MEMORY=unlimited + +# Maximum number of VMA (Virtual Memory Areas) a process can own +# When using Systemd, this setting is ignored and the 'vm.max_map_count' +# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf +#MAX_MAP_COUNT=262144 + +# https://www.elastic.co/guide/en/elasticsearch/reference/master/max-number-of-threads.html +MAX_THREADS=4096 + +rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES -u $MAX_THREADS" diff --git a/app-misc/elasticsearch/files/elasticsearch.init.8 b/app-misc/elasticsearch/files/elasticsearch.init.8 new file mode 100644 index 000000000000..e45ece0829b1 --- /dev/null +++ b/app-misc/elasticsearch/files/elasticsearch.init.8 @@ -0,0 +1,70 @@ +#!/sbin/openrc-run + +name="Elasticsearch" +description="Elasticsearch Server" + +ES_INSTANCE=${RC_SVCNAME#*.} + +if [ -n "${ES_INSTANCE}" ] && [ ${RC_SVCNAME} != "elasticsearch" ]; then + ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}" + CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}" + DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}" +else + ES_BASE_PATH="/var/lib/elasticsearch/_default" + CONF_DIR="/etc/elasticsearch" + DEFAULT_LOG_DIR="/var/log/elasticsearch/_default" +fi + +ES_HOME=${ES_HOME:="/usr/share/elasticsearch"} +ES_USER=${ES_USER:="elasticsearch"} +ES_GROUP=${ES_GROUP:="elasticsearch"} +ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5} +ES_JAVA_HOME=${ES_JAVA_HOME:=$(java-config -g JAVA_HOME)} +MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536} +MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144} + +DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"} +LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"} + +if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then + ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh" +fi + +export ES_INCLUDE +export ES_JAVA_HOME +export ES_JAVA_OPTS +export ES_JVM_OPTIONS +export ES_STARTUP_SLEEP_TIME +export ES_PATH_CONF="${CONF_DIR}" + +pidfile="/run/elasticsearch/${RC_SVCNAME}.pid" + +command="/usr/share/elasticsearch/bin/elasticsearch" +command_args="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}" +command_args_background="--daemonize --pidfile=${pidfile}" +command_user="${ES_USER}:${ES_GROUP}" +required_files="${CONF_DIR}/elasticsearch.yml" +retry="TERM/30/KILL/30" + +depend() { + use net +} + +start_pre() { + if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then + sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT} + fi + + checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch" + checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch" + checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch" + checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}" + checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}" + + # fails to start without keystore + if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then + "${ES_HOME}/bin/elasticsearch-keystore" create + else + "${ES_HOME}/bin/elasticsearch-keystore" upgrade + fi +} |