From nobody Sat Aug 20 00:13:45 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M8fHG0bSKz4ZZVX; Sat, 20 Aug 2022 00:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M8fHG003zz40W2; Sat, 20 Aug 2022 00:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660954426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u1qk3hTT/PixKlzO/UTQkUxeFwtngE8XBLMIQtFXad8=; b=J9sM0DMpEfVgx4EpCd5uK/2ebSd7o4gyt1FqGFPqfW6WG9P1gpesiTPKenyyE73JC7Fyup C9E2N+etM/R8Mi2iVYWnHT8+zImETzKXEB4lbAUit7Sb8QZisb8V5SRZyE7/SyxfSRinkI JH/4dQi0+2Xg4zLsyqcMeZtlgi2Q9kqRj/7ChsqgEOf2ZfSAwWFf8yXKHQS3S7/YM56lAt DBUc8+dGBKUht2JPTsa/ft1fiotJ5f61we+xb7qCC3LAhjBsAJrXizSL5mprK8HWOdBX0w 7O9vUWetpJ8n6qGFpEN5tcUZSpTEGfj8LGHMKjGvfkUwEIEoiiNsHS9vDrQ6yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M8fHF69kXz1Bhq; Sat, 20 Aug 2022 00:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27K0Djtr023882; Sat, 20 Aug 2022 00:13:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27K0DjaT023881; Sat, 20 Aug 2022 00:13:45 GMT (envelope-from git) Date: Sat, 20 Aug 2022 00:13:45 GMT Message-Id: <202208200013.27K0DjaT023881@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: 914541c1f3ff - main - textproc/opensearch: Install plugins config files List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 914541c1f3ffcf8ef7559ce59e17b33cee85e752 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660954426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u1qk3hTT/PixKlzO/UTQkUxeFwtngE8XBLMIQtFXad8=; b=dwrqVgm1caj8UpVhh6CI/nscrYL+TSQyqUBX6yPw+fcmVpsXaMugyqUVcH68oMLrCA2yOY bNzFd0CnWJ1VgSEUBPjp536EMOqAm7T2KcqDZKxF7t1K0iqSZjZwVg8BDnCD3qIOsl7xMe IumKeVxCtBzLGh/d9QtGAEGo8m4+VW8bvsB3+/h3tkdbsWCxEYsmy5uFqNj/piezzEe4uw GT2vGdIk05x2v8lnw9z/K63n0Gz2ypNVYdQrkOUpK2YMVcKsChZtA/mchCGRd2lcnE0STo AMbZnKsQmuS9+do7kV6oCvzgf9TF4FJeEh+UhjACllgg4Nk3RTdbNSJk4+UxOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660954426; a=rsa-sha256; cv=none; b=tcbkcEmkWK9pYWBecyGk4agUObPuNBmUAGfhNi2U+jL742z4Grzhr1yC1KieVgq7fKbjw3 AUgG2f9wmQMt1bJQD8n/3WH7m+4eIk0HbtMVH2Q/UbD60/CjJJi3fDKpOV4yj40oat45w0 MOqAIBi+ICzvQPPcssmH+7vjzmCXKn/cPdxy7KvPTh74qSjCJG7GwQAvmcSojocJ4S4BtT Jr4P46ZeqQ61FpGvFTQXS00dmjXPazDHH3xuPnfZT4iXs5/YF3j31ax6fagYi09v4lIqmu DKf7+Ovx2IW+PODEL7DKBNtHuTcxMa33U3G/V2B4nb0SUVbgzCl2f+aIIhoptQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=914541c1f3ffcf8ef7559ce59e17b33cee85e752 commit 914541c1f3ffcf8ef7559ce59e17b33cee85e752 Author: Romain Tartière AuthorDate: 2022-08-19 22:26:29 +0000 Commit: Romain Tartière CommitDate: 2022-08-20 00:13:34 +0000 textproc/opensearch: Install plugins config files PR: 265704 Reported by: acm --- textproc/opensearch/Makefile | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile index 925b0517ec59..62a68bec938c 100644 --- a/textproc/opensearch/Makefile +++ b/textproc/opensearch/Makefile @@ -37,6 +37,37 @@ OPTIONS_DEFAULT=PLUGINS CONFIG_FILES= opensearch.yml jvm.options log4j2.properties +PLUGINS_CONFIG_FILES= \ + opensearch-notifications-core/notifications-core.yml \ + opensearch-notifications/notifications.yml \ + opensearch-observability/observability.yml \ + opensearch-performance-analyzer/agent-stats-metadata \ + opensearch-performance-analyzer/log4j2.xml \ + opensearch-performance-analyzer/opensearch_security.policy \ + opensearch-performance-analyzer/performance-analyzer.properties \ + opensearch-performance-analyzer/plugin-stats-metadata \ + opensearch-performance-analyzer/rca.conf \ + opensearch-performance-analyzer/rca_idle_master.conf \ + opensearch-performance-analyzer/rca_master.conf \ + opensearch-performance-analyzer/supervisord.conf \ + opensearch-reports-scheduler/reports-scheduler.yml \ + opensearch-security/action_groups.yml \ + opensearch-security/allowlist.yml \ + opensearch-security/audit.yml \ + opensearch-security/config.yml \ + opensearch-security/internal_users.yml \ + opensearch-security/nodes_dn.yml \ + opensearch-security/roles.yml \ + opensearch-security/roles_mapping.yml \ + opensearch-security/tenants.yml \ + opensearch-security/whitelist.yml + +# Upstream provide some *.example files. These are also copied as sample filse +# but we do not register them as @sample to avoid installing filse that needs +# to be tuned a site specific way. +PLUGINS_SAMPLE_CONFIG_FILES= \ + opensearch-security/opensearch.yml + BINS= opensearch opensearch-cli opensearch-env \ opensearch-env-from-file opensearch-keystore \ opensearch-node opensearch-plugin \ @@ -70,6 +101,20 @@ do-install: ${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/opensearch/lib/jna.jar do-install-PLUGINS-on: + ${MKDIR} ${STAGEDIR}${ETCDIR}/opensearch-notifications-core \ + ${STAGEDIR}${ETCDIR}/opensearch-notifications \ + ${STAGEDIR}${ETCDIR}/opensearch-observability \ + ${STAGEDIR}${ETCDIR}/opensearch-performance-analyzer \ + ${STAGEDIR}${ETCDIR}/opensearch-reports-scheduler \ + ${STAGEDIR}${ETCDIR}/opensearch-security +.for f in ${PLUGINS_CONFIG_FILES} + ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample + ${ECHO} "@sample ${ETCDIR}/${f}.sample" >> ${TMPPLIST} +.endfor +.for f in ${PLUGINS_SAMPLE_CONFIG_FILES} + ${INSTALL} ${WRKSRC}/config/${f}.example ${STAGEDIR}${ETCDIR}/${f}.sample + ${ECHO} "${ETCDIR}/${f}.sample" >> ${TMPPLIST} +.endfor (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "plugins" ${STAGEDIR}${PREFIX}/lib/opensearch/) (cd ${WRKSRC}/plugins/opensearch-security/tools && ${COPYTREE_BIN} "*.sh" ${STAGEDIR}${PREFIX}/lib/opensearch/plugins/opensearch-security/tools)