From nobody Fri Feb 07 16:39:38 2025 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 4YqKSV70xGz5mSdC; Fri, 07 Feb 2025 16:39:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YqKSV6RRNz3qwt; Fri, 07 Feb 2025 16:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738946378; 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=rM55s/9SGeJCoo8aXlPMNnqkKpCdS/SzjawZ+Kl/XAI=; b=eXGw+rqhgexTeb9HXDlGnVWSmmoSQKkyftkg3hYLxPVZHlhpW+2Vdanx43razX/K3+1/hm hFBEm23NkFXM568IkoutRxK5K9H/TDIsJ58rJ3YWpTS8EWnO2065tY4zI0hl51ALMSKZKb Riand6RnTlMxq71Yx2BYl89bzkzS6ZtJZ3UtJOKdHQqoFVZ3Jc22+NUHVdv8FyolOecO8z ug6UiQeK9plE3CZcf1b9PZxaNwTHKkvkddJ9MZy+fDkdp+Bp6AXvBmcax4xCrJKAi4Ba3K yjZn4/XCJyxSvoLqGE5MXcUAolm3hym88kmObq4SxSQV/x7QDCBqDzNK7JJunA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738946378; 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=rM55s/9SGeJCoo8aXlPMNnqkKpCdS/SzjawZ+Kl/XAI=; b=jBFfX8sgp3VxL8o2W+RS86sQPuebnavOHxNtf0aLMN+XRT4JqhpWVOF1F8MDswwbQpTMyC 9wkySSDvjRMa1qeb0wFV0F+loHa7xLYTEacWRbDAFGvX1mXIymT/pnhBZByGh78td/BF9A 4Qx+zhvVxqkXHWqCWsAuDehD3bi5zKsfAc+Roai/6t3jUItXjllf/BsahmbCL2bH//dD2i yByficv3d4v5GNOoCR20nCkuwQhj1a18njpShDWRsCZxvW13jOo7iLyT/+1SWhFIaeKgur DukzQgQ/6IExBsF36rzo4MIaQEm2A3gYuS6HPzoqjxnn4DG2eUYYGy1yXjxsMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738946378; a=rsa-sha256; cv=none; b=l4ErgpJ06TWV9fDPPDdGd7ikXQB7232A8hBvPJYW59Y8TPDcTQnWih4k1HBDxGZxenUbU+ 9RbyBjF34RqK83kBZrXBUOoPLqcdzqOk++liXY2ApXbjt5KamHv83W8/qEb/Hov2/eIQv1 tg7dbxXg9oO4fCpLCZastkUPj7hhgpzDmzatzE3I6hZZVBKCHE//PoucX57YT+wiTvWW1o 6TPr5TK6gzUqtltboFYMVs+tdl2iOTwHJkEGpRQlk+Ayzz2Tx5VKoeWoqGiNyySmCF9NpM IoW9u3VvEzUXvQACSBY3W4sw36HxdLs0uqsWqE6gJo5cuXC9ihoDLqC+yF1Q9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YqKSV5jTdzYrf; Fri, 07 Feb 2025 16:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 517Gdc29011324; Fri, 7 Feb 2025 16:39:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 517GdcJa011321; Fri, 7 Feb 2025 16:39:38 GMT (envelope-from git) Date: Fri, 7 Feb 2025 16:39:38 GMT Message-Id: <202502071639.517GdcJa011321@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xavier Beaudouin Subject: git: 0e4614dd4282 - main - net/akhq: Clean up port 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kiwi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e4614dd4282813ee2ef7c430f6c38fcc65b29e8 Auto-Submitted: auto-generated The branch main has been updated by kiwi: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e4614dd4282813ee2ef7c430f6c38fcc65b29e8 commit 0e4614dd4282813ee2ef7c430f6c38fcc65b29e8 Author: Xavier Beaudouin AuthorDate: 2025-02-07 16:18:37 +0000 Commit: Xavier Beaudouin CommitDate: 2025-02-07 16:39:12 +0000 net/akhq: Clean up port In Makefile: - Better COMMENT - Use ${ETCDIR} when applicable - Update PLIST_FILES - Removed post-install part In service file: - Use %WWWOWN%% In sample configuration file, bind to 127.0.0.1 instead of 0.0.0.0 Sponsored by: Klara, Inc. Approved by: 0mp (mentor) Differential Revision: https://reviews.freebsd.org/D48886 --- net/akhq/Makefile | 20 ++++++++++---------- net/akhq/files/akhq.in | 2 +- net/akhq/files/application.yml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/net/akhq/Makefile b/net/akhq/Makefile index 1a8cb7ad331b..d1f433e0d0da 100644 --- a/net/akhq/Makefile +++ b/net/akhq/Makefile @@ -1,12 +1,13 @@ PORTNAME= akhq DISTVERSION= 0.25.1 DISTVERSIONSUFFIX= -all +PORTREVISION= 1 CATEGORIES= net java MASTER_SITES= https://github.com/tchiotludo/akhq/releases/download/${PORTVERSION}/ EXTRACT_SUFX= .jar MAINTAINER= freebsd@hackacad.net -COMMENT= AKHQ (previously known as KafkaHQ) +COMMENT= Kafka Gui for Apache Kafka WWW= https://github.com/tchiotludo/akhq LICENSE= APACHE20 @@ -17,23 +18,22 @@ USE_RC_SUBR= akhq NO_ARCH= yes NO_BUILD= yes +SUB_FILES= akhq +SUB_LIST= WWWOWN=${WWWOWN} -PLIST_FILES= ${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar +PLIST_FILES= "@sample ${ETCDIR}/application.yml.sample" \ + ${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar +PLIST_SUB+= ${SUB_LIST} CONFIG_FILES= application.yml NO_EXTRACT= yes do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/akhq + ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} ${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar - ${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${PREFIX}/etc/akhq/application.yml.sample - ${ECHO} "@sample ${PREFIX}/etc/akhq/application.yml.sample" >> ${TMPPLIST} - -post-install: - @if [ ! -f ${STAGEDIR}${PREFIX}/etc/akhq/application.yml ]; then \ - ${CP} -p ${STAGEDIR}${PREFIX}/etc/akhq/application.yml.sample ${STAGEDIR}${PREFIX}/etc/akhq/application.yml ; \ - fi + ${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml.sample + ${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml .include diff --git a/net/akhq/files/akhq.in b/net/akhq/files/akhq.in index d6556c5f5e67..d13c742faf56 100644 --- a/net/akhq/files/akhq.in +++ b/net/akhq/files/akhq.in @@ -15,7 +15,7 @@ load_rc_config $name : ${akhq_config:=%%LOCALBASE%%/etc/akhq/application.yml} : ${akhq_jar:=%%LOCALBASE%%/share/java/akhq/akhq.jar} : ${akhq_java:=%%LOCALBASE%%/bin/java} -: ${akhq_user:=www} +: ${akhq_user:=%%WWWOWN%%} : ${akhq_pidfile:=/var/run/${name}.pid} command="/usr/sbin/daemon" diff --git a/net/akhq/files/application.yml b/net/akhq/files/application.yml index d80404d95c04..be61195685ce 100644 --- a/net/akhq/files/application.yml +++ b/net/akhq/files/application.yml @@ -6,4 +6,4 @@ akhq: micronaut: server: port: 8080 - host: "0.0.0.0" + host: "127.0.0.1"