pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

nats-server: Update to 2.1.9

Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Mon Nov 23 15:32:55 2020 +0000
Changeset:	42ed2b010a47d98376c8bcd3b6dbf8171d88fff8

Modified Files:
	nats-server/Makefile
	nats-server/PLIST
	nats-server/distinfo
	nats-server/files/nats_server.sh
	nats-server/files/smf/manifest.xml
	nats-server/files/smf/nats-server.sh
	nats-server/go-modules.mk

Log Message:
nats-server: Update to 2.1.9

- Update to 2.1.9
- Create examples directory, install a sample config in it
- Install sample config also to sysconfdir

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=42ed2b010a47d98376c8bcd3b6dbf8171d88fff8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nats-server/Makefile                 | 15 ++++++++++++++-
 nats-server/PLIST                    |  1 +
 nats-server/distinfo                 | 20 ++++++++++++--------
 nats-server/files/nats_server.sh     |  9 +++++++--
 nats-server/files/smf/manifest.xml   |  3 +++
 nats-server/files/smf/nats-server.sh |  3 ++-
 nats-server/go-modules.mk            |  3 ++-
 7 files changed, 41 insertions(+), 13 deletions(-)

diffs:
diff --git a/nats-server/Makefile b/nats-server/Makefile
index a8bed6c9ea..9cf7b8f821 100644
--- a/nats-server/Makefile
+++ b/nats-server/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 #
 
-DISTNAME=		nats-server-2.1.8
+DISTNAME=		nats-server-2.1.9
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GITHUB:=nats-io/}
 GITHUB_TAG=		v${PKGVERSION_NOREV}
@@ -40,9 +40,22 @@ FILES_SUBST+=		NATS_GROUP=${NATS_GROUP}
 FILES_SUBST+=		NATS_HOMEDIR=${NATS_HOMEDIR}
 FILES_SUBST+=		NATS_LOGDIR=${NATS_LOGDIR}
 FILES_SUBST+=		NATS_LOGFILE=${NATS_LOGFILE}
+FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+
+EXAMPLESDIR=		${PREFIX}/share/examples/nats-server
+REQD_FILES_PERMS+=	${EXAMPLESDIR}/nats-server.conf \
+			${PKG_SYSCONFDIR}/nats-server.conf \
+			${NATS_USER} ${NATS_GROUP} 0600
 
 OWN_DIRS_PERMS+=                ${NATS_HOMEDIR} ${NATS_USER} ${NATS_GROUP} 0700
 MAKE_DIRS_PERMS+=                ${NATS_LOGDIR} ${NATS_USER} ${NATS_GROUP} 0700
 
 .include "../../lang/go/go-module.mk"
+
+post-install:
+	${MKDIR} ${DESTDIR}/${EXAMPLESDIR}
+	${TOUCH} ${DESTDIR}/${EXAMPLESDIR}/nats-server.conf
+	${ECHO} "# Example config, see https://docs.nats.io/nats-server/configuration"; >> \
+		${DESTDIR}/${EXAMPLESDIR}/nats-server.conf
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/nats-server/PLIST b/nats-server/PLIST
index 82d0333df6..4a2877cd97 100644
--- a/nats-server/PLIST
+++ b/nats-server/PLIST
@@ -1,2 +1,3 @@
 @comment $NetBSD$
 bin/nats-server
+share/examples/nats-server/nats-server.conf
diff --git a/nats-server/distinfo b/nats-server/distinfo
index fe8936a7e8..2f1cdc5a82 100644
--- a/nats-server/distinfo
+++ b/nats-server/distinfo
@@ -44,10 +44,14 @@ SHA1 (github.com_nats-io_jwt_@v_v0.3.2.mod) = 91b5b0783bbbcdb3693779dc9052e93e29
 RMD160 (github.com_nats-io_jwt_@v_v0.3.2.mod) = 76d5bcec99a09828aa9529af2fde8486067317b5
 SHA512 (github.com_nats-io_jwt_@v_v0.3.2.mod) = 8745b75071b79f3dea777d3eec1e0f74cdefe5b202c8075994f7e68ba8e9bb87afb70d494fbf55944b12182d480da1c1f45c9f057c789b82ec2da81eff6079a2
 Size (github.com_nats-io_jwt_@v_v0.3.2.mod) = 71 bytes
-SHA1 (github.com_nats-io_jwt_@v_v0.3.2.zip) = 8a5e62222fd873c15ef5390f6925368682e6e587
-RMD160 (github.com_nats-io_jwt_@v_v0.3.2.zip) = 24e3b99ca15c268b4354c97018ff35a8ca752ba3
-SHA512 (github.com_nats-io_jwt_@v_v0.3.2.zip) = 2a7512428585894b1f6c443218cb44aae5d75269bacc933b1bc5aea1e9387dca78f3676a59aa66fb5b0e8db849d8d28ff63b5dfe5b875ec726856047529a2232
-Size (github.com_nats-io_jwt_@v_v0.3.2.zip) = 58554 bytes
+SHA1 (github.com_nats-io_jwt_@v_v1.1.0.mod) = d4fff4e4581f0768d380d9cfcbc20356543f2164
+RMD160 (github.com_nats-io_jwt_@v_v1.1.0.mod) = b398ad013fe57f5db9b0688a4e0a430becbbb87e
+SHA512 (github.com_nats-io_jwt_@v_v1.1.0.mod) = e6fda24ddc8e521bbecaa9d70a06f34cbb4f726bdbeeab84317b4f2252fcf04c5fc40beb9e46a251c62b291b2802c40e9f3864201f36bd876571dc21df905e2e
+Size (github.com_nats-io_jwt_@v_v1.1.0.mod) = 80 bytes
+SHA1 (github.com_nats-io_jwt_@v_v1.1.0.zip) = e98ecc218efa93b722633c1bed13de0a2dd36074
+RMD160 (github.com_nats-io_jwt_@v_v1.1.0.zip) = 2415710b06ce048dbbfd255e2c1c5400bc178bf5
+SHA512 (github.com_nats-io_jwt_@v_v1.1.0.zip) = 9e2452c182b1beb3a2ab64439e6449054e35edc7aae4aa9ca2393c7f625daf9fd3fd9c13516db08c90b224ba10be6439a552a7add2b6b165b4618b8fd4a631b9
+Size (github.com_nats-io_jwt_@v_v1.1.0.zip) = 59286 bytes
 SHA1 (github.com_nats-io_nats.go_@v_v1.10.0.mod) = e7cf60ff2920c7bc23bed44ba2476a6f586bec10
 RMD160 (github.com_nats-io_nats.go_@v_v1.10.0.mod) = 913dc694e9db5c3e7b502b52473e41a90df0aac4
 SHA512 (github.com_nats-io_nats.go_@v_v1.10.0.mod) = a84f987c3aeff7b18712d2f29582c443e9af6613c94847a6391d75abba5b37671ab52353297ff34fdfcc73b65e8f1ed835ff127191e5f5577e59cd2930e22066
@@ -160,8 +164,8 @@ SHA1 (google.golang.org_protobuf_@v_v1.22.0.zip) = 0911c9c920a55a86d9a380198f52c
 RMD160 (google.golang.org_protobuf_@v_v1.22.0.zip) = 10881d431a6597637c41580fec8519ae6bc9ee8f
 SHA512 (google.golang.org_protobuf_@v_v1.22.0.zip) = b2f953c416fd7a690e3ac21f69ecab9c5edd8cf18fafbb7db4cddf530dd8d0f95d287ee88a4a7c32405db52a8e22d1b2fb6e7a1de03d7f3159a19cb53959dc42
 Size (google.golang.org_protobuf_@v_v1.22.0.zip) = 1489452 bytes
-SHA1 (nats-server-2.1.8.tar.gz) = d24f3ef4e681dacb553bc2d0f83f12765c4a0267
-RMD160 (nats-server-2.1.8.tar.gz) = a7420c674018189dec8d878d7c9f11b5d538679f
-SHA512 (nats-server-2.1.8.tar.gz) = 2614a1fdb0d34ab8ca557f9282c92ddea5ab5cc53ee25f866b24941c133bb91f81983646c19929f7fdb498feeabab100e43cd65441497fd64eab234d48262706
-Size (nats-server-2.1.8.tar.gz) = 967790 bytes
+SHA1 (nats-server-2.1.9.tar.gz) = 4f55c75544605ad6abec12ebae8ce39363b4dc6f
+RMD160 (nats-server-2.1.9.tar.gz) = 07fefef00925d7be6752260dd00979f38d4804b1
+SHA512 (nats-server-2.1.9.tar.gz) = 41ce9ea00f72630764074b2957b1e8af1937390f87059b4882b4072d7397e5315e3b187e60ee8ea08b8ddb1bdf3d8e7d191b1ca17849d4b981b3a6d71cad0139
+Size (nats-server-2.1.9.tar.gz) = 969583 bytes
 SHA1 (patch-server_pse_pse__netbsd.go) = 9f69352a0a6f976e51488d4693bc7701dd551506
diff --git a/nats-server/files/nats_server.sh b/nats-server/files/nats_server.sh
index 29c847413e..ba6c733173 100644
--- a/nats-server/files/nats_server.sh
+++ b/nats-server/files/nats_server.sh
@@ -12,6 +12,10 @@
 #
 # The following variables are optional:
 #
+# nats_server_config="/path/to/nats-server.conf"
+#					path to nats-server config.file
+#					default:
+#					@PKG_SYSCONFDIR@/nats-server.conf
 # nats_server_pidfile="/path/to/p.pid"	path to nats-server PID file
 #					default:
 #					@NATS_HOMEDIR@/nats-server.pid
@@ -28,6 +32,7 @@ fi
 name="nats_server"
 rcvar="nats_server"
 command="@PREFIX@/bin/nats-server"
+: ${nats_server_config:="@PKG_SYSCONFDIR@/nats-server.conf"}
 : ${nats_server_pidfile:="@NATS_HOMEDIR@/nats-server.pid"}
 : ${nats_server_logfile:="@NATS_LOGFILE@"}
 : ${nats_server_user:="natssrv"}
@@ -39,11 +44,11 @@ stop_cmd="natssrv_stop"
 natssrv_start()
 {
 	@ECHO@ "Starting ${name}."
-	ulimit -n 4096
+	ulimit -n 10240
 	cd @NATS_HOMEDIR@
 	/usr/bin/su ${nats_server_user}:${nats_server_group} \
 	   -c "${command} -P ${nats_server_pidfile} \
-	   -l ${nats_server_logfile} &"
+	   -l ${nats_server_logfile} -c ${nats_server_config} &"
 }
 
 natssrv_stop()
diff --git a/nats-server/files/smf/manifest.xml b/nats-server/files/smf/manifest.xml
index fbd769eb8b..2096f866da 100644
--- a/nats-server/files/smf/manifest.xml
+++ b/nats-server/files/smf/manifest.xml
@@ -10,6 +10,9 @@
     <dependency name='net' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/network/loopback' />
     </dependency>
+    <dependency name='config' grouping='require_all' restart_on='none' type='path'>
+       <service_fmri value='file://@PKG_SYSCONFDIR@/nats-server.conf' />
+    </dependency>
     <method_context working_directory='@VARBASE@/nats-server'>
       <method_credential user='@NATS_USER@' group='@NATS_GROUP@' />
       <method_environment>
diff --git a/nats-server/files/smf/nats-server.sh b/nats-server/files/smf/nats-server.sh
index f3775f5fd7..0a1b9a109e 100644
--- a/nats-server/files/smf/nats-server.sh
+++ b/nats-server/files/smf/nats-server.sh
@@ -9,13 +9,14 @@
 
 PIDFILE="@NATS_HOMEDIR@/nats-server.pid"
 LOGFILE="@NATS_LOGFILE@"
+CONFIGFILE="@PKG_SYSCONFDIR@/nats-server.conf"
 
 ulimit -n 10240
 
 case "$1" in
 start)
    	@PREFIX@/bin/nats-server -P ${PIDFILE} \
-	   -l ${LOGFILE} &
+	   -l ${LOGFILE} -c ${CONFIGFILE} &
 	;;
 stop)
 	[ -f ${PIDFILE} ] && kill `@HEAD@ -1 ${PIDFILE}`
diff --git a/nats-server/go-modules.mk b/nats-server/go-modules.mk
index 91e01585e6..5c88601e92 100644
--- a/nats-server/go-modules.mk
+++ b/nats-server/go-modules.mk
@@ -11,7 +11,8 @@ GO_MODULE_FILES+=	github.com/google/go-cmp/@v/v0.3.1.mod
 GO_MODULE_FILES+=	github.com/google/go-cmp/@v/v0.4.0.mod
 GO_MODULE_FILES+=	github.com/google/go-cmp/@v/v0.4.0.zip
 GO_MODULE_FILES+=	github.com/nats-io/jwt/@v/v0.3.2.mod
-GO_MODULE_FILES+=	github.com/nats-io/jwt/@v/v0.3.2.zip
+GO_MODULE_FILES+=	github.com/nats-io/jwt/@v/v1.1.0.mod
+GO_MODULE_FILES+=	github.com/nats-io/jwt/@v/v1.1.0.zip
 GO_MODULE_FILES+=	github.com/nats-io/nats.go/@v/v1.10.0.mod
 GO_MODULE_FILES+=	github.com/nats-io/nats.go/@v/v1.10.0.zip
 GO_MODULE_FILES+=	github.com/nats-io/nkeys/@v/v0.1.3.mod
Home | Main Index | Thread Index | Old Index