Date: Friday, January 7, 2022 @ 16:22:56 Author: hashworks Revision: 1095926
archrelease: copy trunk to community-x86_64 Added: opensearch/repos/community-x86_64/PKGBUILD (from rev 1095925, opensearch/trunk/PKGBUILD) opensearch/repos/community-x86_64/opensearch-keystore.service (from rev 1095925, opensearch/trunk/opensearch-keystore.service) opensearch/repos/community-x86_64/opensearch-keystore@.service (from rev 1095925, opensearch/trunk/opensearch-keystore@.service) opensearch/repos/community-x86_64/opensearch-sysctl.conf (from rev 1095925, opensearch/trunk/opensearch-sysctl.conf) opensearch/repos/community-x86_64/opensearch-tmpfile.conf (from rev 1095925, opensearch/trunk/opensearch-tmpfile.conf) opensearch/repos/community-x86_64/opensearch-user.conf (from rev 1095925, opensearch/trunk/opensearch-user.conf) opensearch/repos/community-x86_64/opensearch.default (from rev 1095925, opensearch/trunk/opensearch.default) opensearch/repos/community-x86_64/opensearch.service (from rev 1095925, opensearch/trunk/opensearch.service) opensearch/repos/community-x86_64/opensearch@.service (from rev 1095925, opensearch/trunk/opensearch@.service) opensearch/repos/community-x86_64/remove-systemd-distribution-check.patch (from rev 1095925, opensearch/trunk/remove-systemd-distribution-check.patch) Deleted: opensearch/repos/community-x86_64/PKGBUILD opensearch/repos/community-x86_64/opensearch-keystore.service opensearch/repos/community-x86_64/opensearch-keystore@.service opensearch/repos/community-x86_64/opensearch-sysctl.conf opensearch/repos/community-x86_64/opensearch-tmpfile.conf opensearch/repos/community-x86_64/opensearch-user.conf opensearch/repos/community-x86_64/opensearch.default opensearch/repos/community-x86_64/opensearch.service opensearch/repos/community-x86_64/opensearch@.service opensearch/repos/community-x86_64/remove-systemd-distribution-check.patch -----------------------------------------+ PKGBUILD | 432 ++++++++++++++++++++++-------- opensearch-keystore.service | 20 - opensearch-keystore@.service | 22 - opensearch-sysctl.conf | 2 opensearch-tmpfile.conf | 28 - opensearch-user.conf | 2 opensearch.default | 26 - opensearch.service | 132 ++++----- opensearch@.service | 134 ++++----- remove-systemd-distribution-check.patch | 34 +- 10 files changed, 523 insertions(+), 309 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-01-07 16:22:32 UTC (rev 1095925) +++ PKGBUILD 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1,109 +0,0 @@ -# Maintainer: Justin Kromlinger <hashwo...@archlinux.org> -# Contributor: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost> -# Contributor: Blaž "Speed" Hrastnik <https://github.com/archSeer> - -pkgname=opensearch -pkgver=1.2.3 -pkgrel=2 -pkgdesc="Open source distributed and RESTful search engine" -arch=('x86_64') -url="https://opensearch.org/docs/opensearch/index/" -license=('Apache') -depends=('java-runtime-headless<=16' 'systemd' 'libxml2') -optdepends=( - 'opensearch-dashboards' - 'opensearch-alerting-plugin' - 'opensearch-anomaly-detection-plugin' - 'opensearch-asynchronous-search-plugin' - 'opensearch-cross-cluster-replication-plugin' - 'opensearch-index-management-plugin' - 'opensearch-job-scheduler-plugin' - 'opensearch-knn-plugin' - 'opensearch-observability-plugin' - 'opensearch-performance-analyzer-plugin' - 'opensearch-reports-scheduler-plugin' - 'opensearch-security-plugin' - 'opensearch-sql-plugin' -) -# See https://github.com/opensearch-project/OpenSearch/blob/main/.ci/java-versions.properties -makedepends=('java-environment=11') -source=( - "OpenSearch-${pkgver}.tar.gz::https://github.com/opensearch-project/OpenSearch/archive/${pkgver}.tar.gz" - opensearch.service - opensearch@.service - opensearch-keystore.service - opensearch-keystore@.service - opensearch-sysctl.conf - opensearch-user.conf - opensearch-tmpfile.conf - opensearch.default - remove-systemd-distribution-check.patch -) -sha256sums=('d2d0133a1eabaa9ab39fcea2cfec3fdcd787330d125daa406acdaf1fd8783bf6' - 'b59d064ce8e348f22b969cc2b7522a1c7b64d4b4e3fd98d9ad1f01d842e94d46' - '02bfe1e723f6522d7b5bf72d43c7847c4d9329d105b543583aa5b9c952e7d54d' - '097de1fc6ef1f12e99d2b3def9c9803cf0dd8609aeace608048d599a2cb85c5c' - 'a133b8944d57d81224caf03f8d0e5b127f2570123b2a1e2d2f6eb199446448ae' - 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c' - '79cb5856b7105da7f25c6da2a25be88ccba2b849fd92cc32c3204e2fad530efc' - 'c9045725cf2d262257ae2d7074bb4f6d82bdfc1059725ee856440b695c23361a' - '66401172f710e80e1f715c89bc6ed5a6d0ad567c58ad03101e59556c52245158' - '0d158e9fc2ac6375ae9c140eb79e0308794c1a0220d3634a2b98e94b37b6f8dc') - -backup=('etc/opensearch/opensearch.yml' - 'etc/opensearch/log4j2.properties' - 'etc/opensearch/jvm.options' - 'etc/default/opensearch') - -prepare() { - cd "OpenSearch-${pkgver}" - patch -Np1 -i "${srcdir}/remove-systemd-distribution-check.patch" -} - -build() { - cd "OpenSearch-${pkgver}" - export PATH=/usr/lib/jvm/default/bin:$PATH - export GRADLE_OPTS="-Dbuild.snapshot=false" - ./gradlew :distribution:buildSystemdModule - ./gradlew :distribution:archives:linux-tar:build -} - -package() { - cd "OpenSearch-${pkgver}" - - install -dm755 "${pkgdir}"/{usr/share,var/lib,var/log}/opensearch - install -dm755 "${pkgdir}/usr/bin" - - tar xf distribution/archives/linux-tar/build/distributions/opensearch-min-$pkgver-linux-x64.tar.gz \ - --strip 1 -C "${pkgdir}/usr/share/opensearch" - rm -r "${pkgdir}"/usr/share/opensearch/{jdk,logs} - - install -dm755 "${pkgdir}/etc" - mv "${pkgdir}/usr/share/opensearch/config" "${pkgdir}/etc/opensearch" - chmod 2750 "${pkgdir}/etc/opensearch" - - for bin in "${pkgdir}/usr/share/opensearch/bin/"*; do - ln -sT "/usr/share/opensearch/bin/$(basename ${bin})" "${pkgdir}/usr/bin/$(basename ${bin})" - done - - ln -s /etc/opensearch "${pkgdir}/usr/share/opensearch/config" - ln -s /var/log/opensearch "${pkgdir}/usr/share/opensearch/logs" - ln -s /var/lib/opensearch "${pkgdir}/usr/share/opensearch/data" - - install -Dm644 "$srcdir"/opensearch.service "${pkgdir}/usr/lib/systemd/system/opensearch.service" - install -Dm644 "$srcdir"/opensearch@.service "${pkgdir}/usr/lib/systemd/system/opensearch@.service" - install -Dm644 "$srcdir"/opensearch-keystore.service "${pkgdir}/usr/lib/systemd/system/opensearch-keystore.service" - install -Dm644 "$srcdir"/opensearch-keystore@.service "${pkgdir}/usr/lib/systemd/system/opensearch-keystore@.service" - install -Dm644 "$srcdir"/opensearch-user.conf "${pkgdir}/usr/lib/sysusers.d/opensearch.conf" - install -Dm644 "$srcdir"/opensearch-tmpfile.conf "${pkgdir}/usr/lib/tmpfiles.d/opensearch.conf" - install -Dm644 "$srcdir"/opensearch-sysctl.conf "${pkgdir}/usr/lib/sysctl.d/opensearch.conf" - install -Dm644 "$srcdir"/opensearch.default "${pkgdir}/etc/default/opensearch" - - cp -r distribution/build/outputs/systemd/modules/systemd "${pkgdir}/usr/share/opensearch/modules/" - - sed -i '2iJAVA_HOME=/usr/lib/jvm/default-runtime' "${pkgdir}/usr/share/opensearch/bin/opensearch-env" - sed -i 's/OPENSEARCH_BUNDLED_JDK=true/OPENSEARCH_BUNDLED_JDK=false/g' "${pkgdir}/usr/share/opensearch/bin/opensearch-env" - - install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" -} Copied: opensearch/repos/community-x86_64/PKGBUILD (from rev 1095925, opensearch/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1,323 @@ +# Maintainer: Justin Kromlinger <hashwo...@archlinux.org> +# Contributor: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost> +# Contributor: Blaž "Speed" Hrastnik <https://github.com/archSeer> + +pkgbase=opensearch +pkgname=( + opensearch + opensearch-analysis-icu-plugin + opensearch-analysis-kuromoji-plugin + opensearch-analysis-nori-plugin + opensearch-analysis-phonetic-plugin + opensearch-analysis-smartcn-plugin + opensearch-analysis-stempel-plugin + opensearch-analysis-ukrainian-plugin + opensearch-discovery-azure-classic-plugin + opensearch-discovery-ec2-plugin + opensearch-discovery-gce-plugin + opensearch-ingest-attachment-plugin + opensearch-mapper-annotated-text-plugin + opensearch-mapper-murmur3-plugin + opensearch-mapper-size-plugin + opensearch-repository-azure-plugin + opensearch-repository-gcs-plugin + opensearch-repository-hdfs-plugin + opensearch-repository-s3-plugin + opensearch-store-smb-plugin + opensearch-transport-nio-plugin +) +pkgver=1.2.3 +pkgrel=3 +# See https://github.com/opensearch-project/OpenSearch/blob/main/.ci/java-versions.properties +# https://github.com/opensearch-project/OpenSearch/issues/1689 +_jrever=11 +_jdkver=11 +arch=('x86_64') +url="https://opensearch.org/docs/opensearch/index/" +license=('Apache') +makedepends=("jdk${_jdkver}-openjdk" 'unzip') +source=( + "OpenSearch-${pkgver}.tar.gz::https://github.com/opensearch-project/OpenSearch/archive/${pkgver}.tar.gz" + opensearch.service + opensearch@.service + opensearch-keystore.service + opensearch-keystore@.service + opensearch-sysctl.conf + opensearch-user.conf + opensearch-tmpfile.conf + opensearch.default + remove-systemd-distribution-check.patch +) +sha256sums=('d2d0133a1eabaa9ab39fcea2cfec3fdcd787330d125daa406acdaf1fd8783bf6' + 'b59d064ce8e348f22b969cc2b7522a1c7b64d4b4e3fd98d9ad1f01d842e94d46' + '02bfe1e723f6522d7b5bf72d43c7847c4d9329d105b543583aa5b9c952e7d54d' + '097de1fc6ef1f12e99d2b3def9c9803cf0dd8609aeace608048d599a2cb85c5c' + 'a133b8944d57d81224caf03f8d0e5b127f2570123b2a1e2d2f6eb199446448ae' + 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c' + '79cb5856b7105da7f25c6da2a25be88ccba2b849fd92cc32c3204e2fad530efc' + '12c4feb01c5c42e98e53f9d6fd457727ec0bf0b19bf9c4bc2ee216f31afe7afc' + '66401172f710e80e1f715c89bc6ed5a6d0ad567c58ad03101e59556c52245158' + '0d158e9fc2ac6375ae9c140eb79e0308794c1a0220d3634a2b98e94b37b6f8dc') + +prepare() { + cd "OpenSearch-${pkgver}" + patch -Np1 -i "${srcdir}/remove-systemd-distribution-check.patch" +} + +build() { + cd "OpenSearch-${pkgver}" + export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk" + export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH" + export GRADLE_OPTS="-Dbuild.snapshot=false" + + # OpenSearch + ./gradlew :distribution:buildSystemdModule + ./gradlew :distribution:archives:no-jdk-linux-tar:build + + # Plugins + for p in \ + analysis-icu \ + analysis-kuromoji \ + analysis-nori \ + analysis-phonetic \ + analysis-smartcn \ + analysis-stempel \ + analysis-ukrainian \ + discovery-azure-classic \ + discovery-ec2 \ + discovery-gce \ + ingest-attachment \ + mapper-annotated-text \ + mapper-murmur3 \ + mapper-size \ + repository-azure \ + repository-gcs \ + repository-hdfs \ + repository-s3 \ + store-smb \ + transport-nio; do + ./gradlew :plugin:${p}:build + done +} + +package_opensearch() { + pkgdesc="Open source distributed and RESTful search engine" + depends=("jre${_jrever}-openjdk-headless" 'systemd' 'libxml2') + optdepends=( + 'opensearch-analysis-icu-plugin' + 'opensearch-analysis-kuromoji-plugin' + 'opensearch-analysis-nori-plugin' + 'opensearch-analysis-phonetic-plugin' + 'opensearch-analysis-smartcn-plugin' + 'opensearch-analysis-stempel-plugin' + 'opensearch-analysis-ukrainian-plugin' + 'opensearch-discovery-azure-classic-plugin' + 'opensearch-discovery-ec2-plugin' + 'opensearch-discovery-gce-plugin' + 'opensearch-ingest-attachment-plugin' + 'opensearch-mapper-annotated-text-plugin' + 'opensearch-mapper-murmur3-plugin' + 'opensearch-mapper-size-plugin' + 'opensearch-repository-azure-plugin' + 'opensearch-repository-gcs-plugin' + 'opensearch-repository-hdfs-plugin' + 'opensearch-repository-s3-plugin' + 'opensearch-store-smb-plugin' + 'opensearch-transport-nio-plugin' + 'opensearch-alerting-plugin' + 'opensearch-anomaly-detection-plugin' + 'opensearch-asynchronous-search-plugin' + 'opensearch-cross-cluster-replication-plugin' + 'opensearch-index-management-plugin' + 'opensearch-job-scheduler-plugin' + 'opensearch-knn-plugin' + 'opensearch-observability-plugin' + 'opensearch-performance-analyzer-plugin' + 'opensearch-reports-scheduler-plugin' + 'opensearch-security-plugin' + 'opensearch-sql-plugin' + ) + backup=( + 'etc/opensearch/opensearch.yml' + 'etc/opensearch/log4j2.properties' + 'etc/opensearch/jvm.options' + 'etc/default/opensearch' + ) + + cd "OpenSearch-${pkgver}" + + install -dm755 "${pkgdir}"/{usr/share,var/lib,var/log}/opensearch + install -dm755 "${pkgdir}/usr/bin" + + tar xf distribution/archives/no-jdk-linux-tar/build/distributions/opensearch-min-$pkgver-no-jdk-linux-x64.tar.gz \ + --strip 1 -C "${pkgdir}/usr/share/opensearch" + rm -r "${pkgdir}"/usr/share/opensearch/logs + + install -dm755 "${pkgdir}/etc" + mv "${pkgdir}/usr/share/opensearch/config" "${pkgdir}/etc/opensearch" + chmod 2755 "${pkgdir}/etc/opensearch/"{,jvm.options.d} + chmod -R 644 "${pkgdir}/etc/opensearch/"{jvm.options,log4j2.properties} + chmod 640 "${pkgdir}/etc/opensearch/opensearch.yml" # Might contain sensitive information + + ln -sT "/usr/share/opensearch/bin/opensearch" "${pkgdir}/usr/bin/opensearch" + for b in opensearch-keystore opensearch-node opensearch-plugin opensearch-shard opensearch-upgrade; do + ln -sT "/usr/share/opensearch/bin/${b}" "${pkgdir}/usr/bin/${b}" + sed 's|"`dirname "$0"`"|/usr/share/opensearch/bin|' -i "${pkgdir}/usr/share/opensearch/bin/${b}" + done + + ln -s /etc/opensearch "${pkgdir}/usr/share/opensearch/config" + ln -s /var/log/opensearch "${pkgdir}/usr/share/opensearch/logs" + ln -s /var/lib/opensearch "${pkgdir}/usr/share/opensearch/data" + + install -Dm644 "$srcdir"/opensearch.service "${pkgdir}/usr/lib/systemd/system/opensearch.service" + install -Dm644 "$srcdir"/opensearch@.service "${pkgdir}/usr/lib/systemd/system/opensearch@.service" + install -Dm644 "$srcdir"/opensearch-keystore.service "${pkgdir}/usr/lib/systemd/system/opensearch-keystore.service" + install -Dm644 "$srcdir"/opensearch-keystore@.service "${pkgdir}/usr/lib/systemd/system/opensearch-keystore@.service" + install -Dm644 "$srcdir"/opensearch-user.conf "${pkgdir}/usr/lib/sysusers.d/opensearch.conf" + install -Dm644 "$srcdir"/opensearch-tmpfile.conf "${pkgdir}/usr/lib/tmpfiles.d/opensearch.conf" + install -Dm644 "$srcdir"/opensearch-sysctl.conf "${pkgdir}/usr/lib/sysctl.d/opensearch.conf" + install -Dm644 "$srcdir"/opensearch.default "${pkgdir}/etc/default/opensearch" + + cp -r distribution/build/outputs/systemd/modules/systemd "${pkgdir}/usr/share/opensearch/modules/" + + sed -i "2iJAVA_HOME=/usr/lib/jvm/java-${_jrever}-openjdk" "${pkgdir}/usr/share/opensearch/bin/opensearch-env" + + # Since this warning only affects official OpenSearch releases we can remove it on our end + sed -i 's/echo "warning: no-jdk distributions that do not bundle a JDK are deprecated and will be removed in a future release" >&2/:/g' "${pkgdir}/usr/share/opensearch/bin/opensearch-env" + + install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" +} + +_package_plugin() { + plugin="$1" + + install -dm755 "${pkgdir}/usr/share/opensearch/plugins/${plugin}" + install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" + + cd "${pkgdir}/usr/share/opensearch/plugins/${plugin}" + unzip "${srcdir}/OpenSearch-${pkgver}/plugins/${plugin}/build/distributions/${plugin}-${pkgver}.zip" + + mv LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" + mv NOTICE.txt "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE.txt" +} + +package_opensearch-analysis-icu-plugin() { + pkgdesc="The ICU Analysis plugin integrates the Lucene ICU module into OpenSearch, adding ICU-related analysis components." + depends=("opensearch=${pkgver}") + _package_plugin analysis-icu +} + +package_opensearch-analysis-kuromoji-plugin() { + pkgdesc="The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into opensearch." + depends=("opensearch=${pkgver}") + _package_plugin analysis-kuromoji +} + +package_opensearch-analysis-nori-plugin() { + pkgdesc="The Korean (nori) Analysis plugin integrates Lucene nori analysis module into opensearch." + depends=("opensearch=${pkgver}") + _package_plugin analysis-nori +} + +package_opensearch-analysis-phonetic-plugin() { + pkgdesc="The Phonetic Analysis plugin integrates phonetic token filter analysis with opensearch." + depends=("opensearch=${pkgver}") + _package_plugin analysis-phonetic +} + +package_opensearch-analysis-smartcn-plugin() { + pkgdesc="Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into opensearch." + depends=("opensearch=${pkgver}") + _package_plugin analysis-smartcn +} + +package_opensearch-analysis-stempel-plugin() { + pkgdesc="The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into opensearch." + depends=("opensearch=${pkgver}") + _package_plugin analysis-stempel +} + +package_opensearch-analysis-ukrainian-plugin() { + pkgdesc="The Ukrainian Analysis plugin integrates the Lucene UkrainianMorfologikAnalyzer into opensearch." + depends=("opensearch=${pkgver}") + _package_plugin analysis-ukrainian +} + +package_opensearch-discovery-azure-classic-plugin() { + pkgdesc="The Azure Classic Discovery plugin allows to use Azure Classic API for the unicast discovery mechanism" + depends=("opensearch=${pkgver}") + _package_plugin discovery-azure-classic +} + +package_opensearch-discovery-ec2-plugin() { + pkgdesc="The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism." + depends=("opensearch=${pkgver}") + _package_plugin discovery-ec2 +} + +package_opensearch-discovery-gce-plugin() { + pkgdesc="The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism." + depends=("opensearch=${pkgver}") + _package_plugin discovery-gce +} + +package_opensearch-ingest-attachment-plugin() { + pkgdesc="Ingest processor that uses Apache Tika to extract contents" + depends=("opensearch=${pkgver}") + _package_plugin ingest-attachment +} + +package_opensearch-mapper-annotated-text-plugin() { + pkgdesc="The Mapper Annotated_text plugin adds support for text fields with markup used to inject annotation tokens into the index." + depends=("opensearch=${pkgver}") + _package_plugin mapper-annotated-text +} + +package_opensearch-mapper-murmur3-plugin() { + pkgdesc="The Mapper Murmur3 plugin allows to compute hashes of a field\'s values at index-time and to store them in the index." + depends=("opensearch=${pkgver}") + _package_plugin mapper-murmur3 +} + +package_opensearch-mapper-size-plugin() { + pkgdesc="The Mapper Size plugin allows document to record their uncompressed size at index time." + depends=("opensearch=${pkgver}") + _package_plugin mapper-size +} + +package_opensearch-repository-azure-plugin() { + pkgdesc="The Azure Repository plugin adds support for Azure storage repositories." + depends=("opensearch=${pkgver}") + _package_plugin repository-azure +} + +package_opensearch-repository-gcs-plugin() { + pkgdesc="The GCS repository plugin adds Google Cloud Storage support for repositories." + depends=("opensearch=${pkgver}") + _package_plugin repository-gcs +} + +package_opensearch-repository-hdfs-plugin() { + pkgdesc="The HDFS repository plugin adds support for Hadoop Distributed File-System (HDFS) repositories." + depends=("opensearch=${pkgver}") + _package_plugin repository-hdfs +} + +package_opensearch-repository-s3-plugin() { + pkgdesc="The S3 repository plugin adds S3 repositories" + depends=("opensearch=${pkgver}") + _package_plugin repository-s3 +} + +package_opensearch-store-smb-plugin() { + pkgdesc="The Store SMB plugin adds support for SMB stores." + depends=("opensearch=${pkgver}") + _package_plugin store-smb +} + +package_opensearch-transport-nio-plugin() { + pkgdesc="The nio transport." + depends=("opensearch=${pkgver}") + _package_plugin transport-nio +} Deleted: opensearch-keystore.service =================================================================== --- opensearch-keystore.service 2022-01-07 16:22:32 UTC (rev 1095925) +++ opensearch-keystore.service 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1,10 +0,0 @@ -[Unit] -Description=OpenSearch Keystore Generation -ConditionPathExists=|!/etc/opensearch/opensearch.keystore - -[Service] -Type=oneshot -Group=opensearch -UMask=0007 -ExecStart=/usr/share/opensearch/bin/opensearch-keystore create -RemainAfterExit=yes Copied: opensearch/repos/community-x86_64/opensearch-keystore.service (from rev 1095925, opensearch/trunk/opensearch-keystore.service) =================================================================== --- opensearch-keystore.service (rev 0) +++ opensearch-keystore.service 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSearch Keystore Generation +ConditionPathExists=|!/etc/opensearch/opensearch.keystore + +[Service] +Type=oneshot +Group=opensearch +UMask=0007 +ExecStart=/usr/share/opensearch/bin/opensearch-keystore create +RemainAfterExit=yes Deleted: opensearch-keystore@.service =================================================================== --- opensearch-keystore@.service 2022-01-07 16:22:32 UTC (rev 1095925) +++ opensearch-keystore@.service 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1,11 +0,0 @@ -[Unit] -Description=OpenSearch Keystore Generation -ConditionPathExists=|!/etc/opensearch/%I/opensearch.keystore - -[Service] -Type=oneshot -Group=opensearch -UMask=0007 -Environment=ES_PATH_CONF=/etc/opensearch/%I -ExecStart=/usr/share/opensearch/bin/opensearch-keystore create -RemainAfterExit=yes Copied: opensearch/repos/community-x86_64/opensearch-keystore@.service (from rev 1095925, opensearch/trunk/opensearch-keystore@.service) =================================================================== --- opensearch-keystore@.service (rev 0) +++ opensearch-keystore@.service 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1,11 @@ +[Unit] +Description=OpenSearch Keystore Generation +ConditionPathExists=|!/etc/opensearch/%I/opensearch.keystore + +[Service] +Type=oneshot +Group=opensearch +UMask=0007 +Environment=ES_PATH_CONF=/etc/opensearch/%I +ExecStart=/usr/share/opensearch/bin/opensearch-keystore create +RemainAfterExit=yes Deleted: opensearch-sysctl.conf =================================================================== --- opensearch-sysctl.conf 2022-01-07 16:22:32 UTC (rev 1095925) +++ opensearch-sysctl.conf 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1 +0,0 @@ -vm.max_map_count=262144 \ No newline at end of file Copied: opensearch/repos/community-x86_64/opensearch-sysctl.conf (from rev 1095925, opensearch/trunk/opensearch-sysctl.conf) =================================================================== --- opensearch-sysctl.conf (rev 0) +++ opensearch-sysctl.conf 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1 @@ +vm.max_map_count=262144 \ No newline at end of file Deleted: opensearch-tmpfile.conf =================================================================== --- opensearch-tmpfile.conf 2022-01-07 16:22:32 UTC (rev 1095925) +++ opensearch-tmpfile.conf 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1,14 +0,0 @@ -d /var/log/opensearch 0755 opensearch opensearch - -d /var/lib/opensearch 0755 opensearch opensearch - -d /usr/share/opensearch/plugins 0755 opensearch opensearch - - -d /etc/opensearch 2750 - opensearch - -d /etc/opensearch/scripts 0750 - opensearch - -d /etc/opensearch/jvm.options.d 0750 - opensearch - -z /etc/opensearch/jvm.options 0640 root opensearch -z /etc/opensearch/opensearch.yml 0640 root opensearch -z /etc/opensearch/log4j2.properties 0640 root opensearch -z /etc/opensearch/role_mapping.yml 0640 root opensearch -z /etc/opensearch/roles.yml 0640 root opensearch -z /etc/opensearch/users 0640 root opensearch -z /etc/opensearch/users_roles 0640 root opensearch Copied: opensearch/repos/community-x86_64/opensearch-tmpfile.conf (from rev 1095925, opensearch/trunk/opensearch-tmpfile.conf) =================================================================== --- opensearch-tmpfile.conf (rev 0) +++ opensearch-tmpfile.conf 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1,14 @@ +d /var/log/opensearch 0755 opensearch opensearch - +d /var/lib/opensearch 0755 opensearch opensearch - +d /usr/share/opensearch/plugins 0755 opensearch opensearch - + +d /etc/opensearch 2755 - opensearch - +d /etc/opensearch/scripts 0755 - opensearch - +d /etc/opensearch/jvm.options.d 0755 - opensearch - +z /etc/opensearch/jvm.options 0644 root opensearch +z /etc/opensearch/opensearch.yml 0640 root opensearch +z /etc/opensearch/log4j2.properties 0644 root opensearch +z /etc/opensearch/role_mapping.yml 0644 root opensearch +z /etc/opensearch/roles.yml 0644 root opensearch +z /etc/opensearch/users 0644 root opensearch +z /etc/opensearch/users_roles 0644 root opensearch Deleted: opensearch-user.conf =================================================================== --- opensearch-user.conf 2022-01-07 16:22:32 UTC (rev 1095925) +++ opensearch-user.conf 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1 +0,0 @@ -u opensearch - "OpenSearch user" Copied: opensearch/repos/community-x86_64/opensearch-user.conf (from rev 1095925, opensearch/trunk/opensearch-user.conf) =================================================================== --- opensearch-user.conf (rev 0) +++ opensearch-user.conf 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1 @@ +u opensearch - "OpenSearch user" Deleted: opensearch.default =================================================================== --- opensearch.default 2022-01-07 16:22:32 UTC (rev 1095925) +++ opensearch.default 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1,13 +0,0 @@ -JAVA_HOME=/usr/lib/jvm/default-runtime - -# Heap Size (defaults to 256m min, 1g max) -#OPENSEARCH_HEAP_SIZE=1g - -# Heap new generation -#OPENSEARCH_HEAP_NEWSIZE= - -# max direct memory -#OPENSEARCH_DIRECT_SIZE= - -# Additional Java OPTS -#OPENSEARCH_JAVA_OPTS= Copied: opensearch/repos/community-x86_64/opensearch.default (from rev 1095925, opensearch/trunk/opensearch.default) =================================================================== --- opensearch.default (rev 0) +++ opensearch.default 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1,13 @@ +JAVA_HOME=/usr/lib/jvm/default-runtime + +# Heap Size (defaults to 256m min, 1g max) +#OPENSEARCH_HEAP_SIZE=1g + +# Heap new generation +#OPENSEARCH_HEAP_NEWSIZE= + +# max direct memory +#OPENSEARCH_DIRECT_SIZE= + +# Additional Java OPTS +#OPENSEARCH_JAVA_OPTS= Deleted: opensearch.service =================================================================== --- opensearch.service 2022-01-07 16:22:32 UTC (rev 1095925) +++ opensearch.service 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1,66 +0,0 @@ -[Unit] -Description=OpenSearch -Documentation=https://opensearch.org/docs/opensearch/index/ -Wants=opensearch-keystore.service -Wants=network-online.target -After=opensearch-keystore.service -After=network-online.target - -[Service] -Type=notify -RuntimeDirectory=opensearch -PrivateTmp=true -Environment=OPENSEARCH_HOME=/usr/share/opensearch -Environment=OPENSEARCH_PATH_CONF=/etc/opensearch -Environment=PID_DIR=/run/opensearch -Environment=OPENSEARCH_SD_NOTIFY=true -EnvironmentFile=-/etc/default/opensearch - -WorkingDirectory=/usr/share/opensearch - -User=opensearch -Group=opensearch - -PermissionsStartOnly=true -ExecStartPre=/usr/share/opensearch/bin/opensearch-keystore upgrade - -ExecStart=/usr/share/opensearch/bin/opensearch -p ${PID_DIR}/opensearch.pid - -# StandardOutput is configured to redirect to journalctl since -# some error messages may be logged in standard output before -# opensearch logging system is initialized. opensearch -# stores its logs in /var/log/opensearch and does not use -# journalctl by default. If you also want to enable journalctl -# logging, you can simply remove the "quiet" option from ExecStart. -StandardOutput=journal -StandardError=inherit - -# Specifies the maximum file descriptor number that can be opened by this process -LimitNOFILE=65535 - -# Specifies the maximum number of processes -LimitNPROC=4096 - -# Specifies the maximum size of virtual memory -LimitAS=infinity - -# Specifies the maximum file size -LimitFSIZE=infinity - -# Disable timeout logic and wait until process is stopped -TimeoutStopSec=0 - -# SIGTERM signal is used to stop the Java process -KillSignal=SIGTERM - -# Send the signal only to the JVM rather than its control group -KillMode=process - -# 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 Copied: opensearch/repos/community-x86_64/opensearch.service (from rev 1095925, opensearch/trunk/opensearch.service) =================================================================== --- opensearch.service (rev 0) +++ opensearch.service 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1,66 @@ +[Unit] +Description=OpenSearch +Documentation=https://opensearch.org/docs/opensearch/index/ +Wants=opensearch-keystore.service +Wants=network-online.target +After=opensearch-keystore.service +After=network-online.target + +[Service] +Type=notify +RuntimeDirectory=opensearch +PrivateTmp=true +Environment=OPENSEARCH_HOME=/usr/share/opensearch +Environment=OPENSEARCH_PATH_CONF=/etc/opensearch +Environment=PID_DIR=/run/opensearch +Environment=OPENSEARCH_SD_NOTIFY=true +EnvironmentFile=-/etc/default/opensearch + +WorkingDirectory=/usr/share/opensearch + +User=opensearch +Group=opensearch + +PermissionsStartOnly=true +ExecStartPre=/usr/share/opensearch/bin/opensearch-keystore upgrade + +ExecStart=/usr/share/opensearch/bin/opensearch -p ${PID_DIR}/opensearch.pid + +# StandardOutput is configured to redirect to journalctl since +# some error messages may be logged in standard output before +# opensearch logging system is initialized. opensearch +# stores its logs in /var/log/opensearch and does not use +# journalctl by default. If you also want to enable journalctl +# logging, you can simply remove the "quiet" option from ExecStart. +StandardOutput=journal +StandardError=inherit + +# Specifies the maximum file descriptor number that can be opened by this process +LimitNOFILE=65535 + +# Specifies the maximum number of processes +LimitNPROC=4096 + +# Specifies the maximum size of virtual memory +LimitAS=infinity + +# Specifies the maximum file size +LimitFSIZE=infinity + +# Disable timeout logic and wait until process is stopped +TimeoutStopSec=0 + +# SIGTERM signal is used to stop the Java process +KillSignal=SIGTERM + +# Send the signal only to the JVM rather than its control group +KillMode=process + +# 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 Deleted: opensearch@.service =================================================================== --- opensearch@.service 2022-01-07 16:22:32 UTC (rev 1095925) +++ opensearch@.service 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1,67 +0,0 @@ -[Unit] -Description=OpenSearch %I -Documentation=https://opensearch.org -Wants=opensearch-keystore@%i.service -Wants=network-online.target -After=opensearch-keystore@%i.service -After=network-online.target - -[Service] -Type=notify -RuntimeDirectory=opensearch -PrivateTmp=true -Environment=OPENSEARCH_HOME=/usr/share/opensearch -Environment=OPENSEARCH_PATH_CONF=/etc/opensearch/%I -Environment=PID_DIR=/run/opensearch -Environment=OPENSEARCH_SD_NOTIFY=true -EnvironmentFile=-/etc/default/opensearch -PIDFile=/run/opensearch/%I.pid - -WorkingDirectory=/usr/share/opensearch - -User=opensearch -Group=opensearch - -PermissionsStartOnly=true -ExecStartPre=/usr/share/opensearch/bin/opensearch-keystore upgrade - -ExecStart=/usr/share/opensearch/bin/opensearch -p ${PID_DIR}/%I.pid - -# StandardOutput is configured to redirect to journalctl since -# some error messages may be logged in standard output before -# opensearch logging system is initialized. opensearch -# stores its logs in /var/log/opensearch and does not use -# journalctl by default. If you also want to enable journalctl -# logging, you can simply remove the "quiet" option from ExecStart. -StandardOutput=journal -StandardError=inherit - -# Specifies the maximum file descriptor number that can be opened by this process -LimitNOFILE=65535 - -# Specifies the maximum number of processes -LimitNPROC=4096 - -# Specifies the maximum size of virtual memory -LimitAS=infinity - -# Specifies the maximum file size -LimitFSIZE=infinity - -# Disable timeout logic and wait until process is stopped -TimeoutStopSec=0 - -# SIGTERM signal is used to stop the Java process -KillSignal=SIGTERM - -# Send the signal only to the JVM rather than its control group -KillMode=process - -# 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 Copied: opensearch/repos/community-x86_64/opensearch@.service (from rev 1095925, opensearch/trunk/opensearch@.service) =================================================================== --- opensearch@.service (rev 0) +++ opensearch@.service 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1,67 @@ +[Unit] +Description=OpenSearch %I +Documentation=https://opensearch.org +Wants=opensearch-keystore@%i.service +Wants=network-online.target +After=opensearch-keystore@%i.service +After=network-online.target + +[Service] +Type=notify +RuntimeDirectory=opensearch +PrivateTmp=true +Environment=OPENSEARCH_HOME=/usr/share/opensearch +Environment=OPENSEARCH_PATH_CONF=/etc/opensearch/%I +Environment=PID_DIR=/run/opensearch +Environment=OPENSEARCH_SD_NOTIFY=true +EnvironmentFile=-/etc/default/opensearch +PIDFile=/run/opensearch/%I.pid + +WorkingDirectory=/usr/share/opensearch + +User=opensearch +Group=opensearch + +PermissionsStartOnly=true +ExecStartPre=/usr/share/opensearch/bin/opensearch-keystore upgrade + +ExecStart=/usr/share/opensearch/bin/opensearch -p ${PID_DIR}/%I.pid + +# StandardOutput is configured to redirect to journalctl since +# some error messages may be logged in standard output before +# opensearch logging system is initialized. opensearch +# stores its logs in /var/log/opensearch and does not use +# journalctl by default. If you also want to enable journalctl +# logging, you can simply remove the "quiet" option from ExecStart. +StandardOutput=journal +StandardError=inherit + +# Specifies the maximum file descriptor number that can be opened by this process +LimitNOFILE=65535 + +# Specifies the maximum number of processes +LimitNPROC=4096 + +# Specifies the maximum size of virtual memory +LimitAS=infinity + +# Specifies the maximum file size +LimitFSIZE=infinity + +# Disable timeout logic and wait until process is stopped +TimeoutStopSec=0 + +# SIGTERM signal is used to stop the Java process +KillSignal=SIGTERM + +# Send the signal only to the JVM rather than its control group +KillMode=process + +# 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 Deleted: remove-systemd-distribution-check.patch =================================================================== --- remove-systemd-distribution-check.patch 2022-01-07 16:22:32 UTC (rev 1095925) +++ remove-systemd-distribution-check.patch 2022-01-07 16:22:56 UTC (rev 1095926) @@ -1,17 +0,0 @@ -diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java -index 40cc219cbb4..5b89f469da7 100644 ---- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java -+++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java -@@ -59,11 +59,7 @@ public class SystemdPlugin extends Plugin implements ClusterPlugin { - } - - SystemdPlugin(final boolean assertIsPackageDistribution, final Build.Type buildType, final String esSDNotify) { -- final boolean isPackageDistribution = buildType == Build.Type.DEB || buildType == Build.Type.RPM; -- if (assertIsPackageDistribution) { -- // our build is configured to only include this module in the package distributions -- assert isPackageDistribution : buildType; -- } -+ final boolean isPackageDistribution = true; - if (isPackageDistribution == false) { - logger.debug("disabling sd_notify as the build type [{}] is not a package distribution", buildType); - enabled = false; Copied: opensearch/repos/community-x86_64/remove-systemd-distribution-check.patch (from rev 1095925, opensearch/trunk/remove-systemd-distribution-check.patch) =================================================================== --- remove-systemd-distribution-check.patch (rev 0) +++ remove-systemd-distribution-check.patch 2022-01-07 16:22:56 UTC (rev 1095926) @@ -0,0 +1,17 @@ +diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java +index 40cc219cbb4..5b89f469da7 100644 +--- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java ++++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java +@@ -59,11 +59,7 @@ public class SystemdPlugin extends Plugin implements ClusterPlugin { + } + + SystemdPlugin(final boolean assertIsPackageDistribution, final Build.Type buildType, final String esSDNotify) { +- final boolean isPackageDistribution = buildType == Build.Type.DEB || buildType == Build.Type.RPM; +- if (assertIsPackageDistribution) { +- // our build is configured to only include this module in the package distributions +- assert isPackageDistribution : buildType; +- } ++ final boolean isPackageDistribution = true; + if (isPackageDistribution == false) { + logger.debug("disabling sd_notify as the build type [{}] is not a package distribution", buildType); + enabled = false;