From owner-svn-ports-all@freebsd.org Mon Feb 18 21:52:30 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63A2C14ED3EE; Mon, 18 Feb 2019 21:52:30 +0000 (UTC) (envelope-from ehaupt@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F359387FFD; Mon, 18 Feb 2019 21:52:29 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3883BF99; Mon, 18 Feb 2019 21:52:29 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1ILqTIZ071177; Mon, 18 Feb 2019 21:52:29 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1ILqTiv071173; Mon, 18 Feb 2019 21:52:29 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201902182152.x1ILqTiv071173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Mon, 18 Feb 2019 21:52:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493327 - in head/sysutils/digdag: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/sysutils/digdag: . files X-SVN-Commit-Revision: 493327 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F359387FFD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2019 21:52:30 -0000 Author: ehaupt Date: Mon Feb 18 21:52:28 2019 New Revision: 493327 URL: https://svnweb.freebsd.org/changeset/ports/493327 Log: - Provide a startup script - Provide a sample config Added: head/sysutils/digdag/files/ head/sysutils/digdag/files/digdag.conf.sample (contents, props changed) head/sysutils/digdag/files/digdag.in (contents, props changed) Modified: head/sysutils/digdag/Makefile head/sysutils/digdag/pkg-plist (contents, props changed) Modified: head/sysutils/digdag/Makefile ============================================================================== --- head/sysutils/digdag/Makefile Mon Feb 18 21:52:06 2019 (r493326) +++ head/sysutils/digdag/Makefile Mon Feb 18 21:52:28 2019 (r493327) @@ -3,6 +3,7 @@ PORTNAME= digdag DISTVERSION= 0.9.33 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://dl.bintray.com/digdag/maven/ \ LOCAL/ehaupt @@ -14,6 +15,7 @@ COMMENT= Workload Automation System LICENSE= APACHE20 USE_JAVA= yes +USE_RC_SUBR= ${PORTNAME} JAVA_RUN= yes JAVA_VENDOR= openjdk @@ -22,8 +24,14 @@ JAVA_VERSION= 1.8+ NO_BUILD= yes NO_ARCH= yes -PLIST_SUB= VERSION=${DISTVERSION} +USERS= digdag +SUB_LIST= PORTNAME=${PORTNAME} USERS=${USERS} JAVA=${JAVA} +PLIST_SUB= VERSION=${DISTVERSION} USERS=${USERS} + +VARLOG= /var/log/${PORTNAME} +VARRUN= /var/run/${PORTNAME} + do-extract: @${MKDIR} ${WRKSRC} @${PRINTF} "#!/bin/sh\nexec \"${JAVA}\" -jar \ @@ -35,6 +43,11 @@ do-install: ${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/ ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample \ + ${STAGEDIR}${PREFIX}/etc + + @${MKDIR} ${STAGEDIR}${VARLOG} + @${MKDIR} ${STAGEDIR}${VARRUN} cklatest: @${ECHO} "Port: ${DISTVERSION}" Added: head/sysutils/digdag/files/digdag.conf.sample ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/digdag/files/digdag.conf.sample Mon Feb 18 21:52:28 2019 (r493327) @@ -0,0 +1,55 @@ +# In the config file, following parameters are available +# See https://docs.digdag.io/command_reference.html#server-mode-commands +# +#server.bind (ip address) +#server.port (integer) +#server.admin.bind (ip address) +#server.admin.port (integer) +#server.access-log.path (string. same with –access-log) +#server.access-log.pattern (string, “json”, “combined” or “common”) +#server.http.io-threads (number of HTTP IO threads in integer. default: available CPU cores or 2, whichever is greater) +#server.http.worker-threads (number of HTTP worker threads in integer. default: server.http.io-threads * 8) +#server.http.no-request-timeout (maximum allowed time for clients to keep a connection open without sending requests or receiving responses in seconds. default: 60) +#server.http.request-parse-timeout (maximum allowed time of reading a HTTP request in seconds. this doesn’t affect on reading request body. default: 30) +#server.http.io-idle-timeout (maximum allowed idle time of reading HTTP request and writing HTTP response in seconds. default: 300) +#server.http.enable-http2 (enable HTTP/2. default: false) +#server.http.headers.KEY = VALUE (HTTP header to set on API responses) +#server.jmx.port (port to listen JMX in integer. default: JMX is disabled) +#database.type (enum, “h2” or “postgresql”) +#database.user (string) +#database.password (string) +#database.host (string) +#database.port (integer) +#database.database (string) +#database.loginTimeout (seconds in integer, default: 30) +#database.socketTimeout (seconds in integer, default: 1800) +#database.ssl (boolean, default: false) +#database.connectionTimeout (seconds in integer, default: 30) +#database.idleTimeout (seconds in integer, default: 600) +#database.validationTimeout (seconds in integer, default: 5) +#database.maximumPoolSize (integer, default: available CPU cores * 32) +#archive.type (type of project archiving, “db” or “s3”. default: “db”) +#archive.s3.endpoint (string. default: “s3.amazonaws.com”) +#archive.s3.bucket (string) +#archive.s3.path (string) +#archive.s3.credentials.access-key-id (string. default: instance profile) +#archive.s3.credentials.secret-access-key (string. default: instance profile) +#archive.s3.path-style-access (boolean. default: false) +#log-server.type (type of log storage, “local” , “null”, or “s3”. default: “null”. This parameter will be overwritten with “local” if -O, --task-log DIR is set.) +#log-server.s3.endpoint (string, default: “s3.amazonaws.com”) +#log-server.s3.bucket (string) +#log-server.s3.path (string) +#log-server.s3.direct_download (boolean. default: false) +#log-server.s3.credentials.access-key-id (string. default: instance profile) +#log-server.s3.credentials.secret-access-key (string. default: instance profile) +#log-server.s3.path-style-access (boolean. default: false) +#digdag.secret-encryption-key = (base64 encoded 128-bit AES encryption key) +#executor.task_ttl (string. default: 1d. A task is killed if it is running longer than this period.) +#executor.attempt_ttl (string. default: 7d. An attempt is killed if it is running longer than this period.) +#api.max_attempts_page_size (integer. The max number of rows of attempts in api response) +#api.max_sessions_page_size (integer. The max number of rows of sessions in api response) + +server.bind=127.0.0.1 +# generate with: +# openssl rand -base64 16 +#digdag.secret-encryption-key= Added: head/sysutils/digdag/files/digdag.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/digdag/files/digdag.in Mon Feb 18 21:52:28 2019 (r493327) @@ -0,0 +1,37 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: digdag +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# digdag_enable (bool): Set to NO by default. +# Set it to YES to enable it. +# digdag_user: The user account the digdag daemon runs as. +# It uses 'digdag' user by default. +# Do not sets it as empty or it will run as root. +# digdag_conf: The configuration file digdag uses. +# Default: %%PREFIX%%/etc/digdag.conf +# digdag_logfile: The log file digdag uses. +# Default: /var/log/digdag/digdag.log + +. /etc/rc.subr +name="digdag" +rcvar="${name}_enable" +load_rc_config ${name} + +: ${digdag_enable:="NO"} +: ${digdag_user:="digdag"} +: ${digdag_conf:="%%PREFIX%%/etc/digdag.conf"} +: ${digdag_logfile="/var/log/digdag/digdag.log"} + +command="/usr/sbin/daemon" +pidfile=/var/run/digdag/digdag.pid +procname="%%JAVA%%" +digdag_flags="-f -p ${pidfile} ${name} server --log ${digdag_logfile} --config ${digdag_conf}" + +run_rc_command "$1" Modified: head/sysutils/digdag/pkg-plist ============================================================================== --- head/sysutils/digdag/pkg-plist Mon Feb 18 21:52:06 2019 (r493326) +++ head/sysutils/digdag/pkg-plist Mon Feb 18 21:52:28 2019 (r493327) @@ -1,2 +1,6 @@ +@sample etc/digdag.conf.sample %%JAVAJARDIR%%/digdag/digdag-%%VERSION%%.jar bin/digdag +@owner %%USERS%% +@dir /var/log/digdag +@dir /var/run/digdag