From nobody Wed Jan 19 22:19:18 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 4AD141956165; Wed, 19 Jan 2022 22:19:19 +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 4JfKn25lrjz3HrK; Wed, 19 Jan 2022 22:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642630758; 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=CkmB5IQLhWspxNR0H4zgb+7p1en9d5CM0/u60DoVWH8=; b=vjAemUqMTrViqZcZ9pGDETQwIzj/41U4GawPP3GCKDaGo6LQc3F8UY4FcQ5qYcVJhVz4st SyQFzlTvAQLWAY58heU5bMm83TJcH6v0IfruyQFYJ/G38NYaHzTfiDBktDuRV2E3whiJ0h F+oKChWpoCPdMwJSsBsW9JaHcWVgcaLo1j7vMZBoPkCjk/c7HYKxxmJoTLE2/dZp29SAp5 csFsYWIAIfYoqqr21oX7s5s9CAJlkiJlu1e2cI5yqrA7RLRqy+v5bCbMcLYLVYxAVIJeD8 F5k1ylhIyCFu57Zr3FthYZHPaZPN3EdoMeWihzmy9FuANM+LYyhk59Lph/4KgA== 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 369B61CE81; Wed, 19 Jan 2022 22:19:18 +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 20JMJINO039864; Wed, 19 Jan 2022 22:19:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JMJIC4039863; Wed, 19 Jan 2022 22:19:18 GMT (envelope-from git) Date: Wed, 19 Jan 2022 22:19:18 GMT Message-Id: <202201192219.20JMJIC4039863@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: edc99c24c3c0 - main - sysutils/digdag: Improve startup script 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edc99c24c3c089289441f281c36e12861c437abc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642630758; 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=CkmB5IQLhWspxNR0H4zgb+7p1en9d5CM0/u60DoVWH8=; b=B4BkDYLe6GBCJ/74qzCxl/DOSQngdhyiwhvxOXTDL3PNSxc5TEzw5Q2445nGCJ7Rex/062 jn0Ki+O10ccl2vcDfswWPVHxJCaL/qw4DIAIJ3pVQCfygaAE/pSZt8HGNVG1bfIBh2i2Kx 085iJecV0MTAeIt4jfUo3obdD7cBbyK/vitmomSho9UmQIikUu1IqbxeZssB66WDRqm+ZL 46zgF+0oPLChjkCoeIDJLuP4CWAM0KbSE7WdFkJtVZ2V6vuUgnGlf8tjo+xnTfohXppFPy ufcDEEQv8kT5HK+CcyP8ZnQ8ZCoRXsis+D9luyyFvQXrocWorVSMc24sFLuPKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642630758; a=rsa-sha256; cv=none; b=laSyIrSIKUgrr60zoqwqDMPjKehHZaiZoGdOWvfsTmyXNUAbJHfbjCwVwuKaxvx3Ptdico e5djxg7IpDKRo+FYAhD4y9zK0hjtcxaHc9YH0aVLPz9V2KvG7+5ddO2gGBjEIVYAZ5S9fZ l1FSLTbcJrfdOQ/4QMFrIwRVGTCW/T60+doztx0lWSP66NtIwLGPONI2aeoREOlqvwj21X /V3XgxSYvU8LqK2Jb23y7leqManVgKnV4Q1gNLGWJSgHcBjyDPnJczGYY0Hadn4u0hm93c m8/h+zmuKw1b/GWkpwo07CWmIs2ksl9xJYHvHbsB9xWKooD/GVTnjVGo6TCEgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=edc99c24c3c089289441f281c36e12861c437abc commit edc99c24c3c089289441f281c36e12861c437abc Author: Emanuel Haupt AuthorDate: 2022-01-19 22:19:04 +0000 Commit: Emanuel Haupt CommitDate: 2022-01-19 22:19:04 +0000 sysutils/digdag: Improve startup script Improve startup script to provide a better user experience. The default configuration provides a typical minimal ready-to-go setup. While here pacify portclippy and portfmt. --- sysutils/digdag/Makefile | 20 ++++++++++---------- sysutils/digdag/files/digdag.conf.sample | 1 + sysutils/digdag/files/digdag.in | 23 +++++++++++++++++++++-- sysutils/digdag/pkg-plist | 1 - 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/sysutils/digdag/Makefile b/sysutils/digdag/Makefile index 498caeb40770..f26ad65d7833 100644 --- a/sysutils/digdag/Makefile +++ b/sysutils/digdag/Makefile @@ -2,6 +2,7 @@ PORTNAME= digdag DISTVERSION= 0.10.4 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://github.com/treasure-data/digdag/releases/download/v${DISTVERSION}/ \ LOCAL/ehaupt @@ -13,21 +14,21 @@ COMMENT= Workload Automation System LICENSE= APACHE20 USE_JAVA= yes -USE_RC_SUBR= ${PORTNAME} - -JAVA_RUN= yes -JAVA_VENDOR= openjdk JAVA_VERSION= 1.8+ +JAVA_VENDOR= openjdk +JAVA_RUN= yes +USE_RC_SUBR= ${PORTNAME} -NO_BUILD= yes NO_ARCH= yes +NO_BUILD= yes +SUB_LIST= JAVA=${JAVA} \ + PORTNAME=${PORTNAME} \ + USERS=${USERS} USERS= digdag +PLIST_SUB= USERS=${USERS} \ + VERSION=${DISTVERSION} -SUB_LIST= PORTNAME=${PORTNAME} USERS=${USERS} JAVA=${JAVA} -PLIST_SUB= VERSION=${DISTVERSION} USERS=${USERS} - -VARLOG= /var/log/${PORTNAME} VARRUN= /var/run/${PORTNAME} do-extract: @@ -44,7 +45,6 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample \ ${STAGEDIR}${PREFIX}/etc - @${MKDIR} ${STAGEDIR}${VARLOG} @${MKDIR} ${STAGEDIR}${VARRUN} cklatest: diff --git a/sysutils/digdag/files/digdag.conf.sample b/sysutils/digdag/files/digdag.conf.sample index b372d58c6660..49f9496b15d7 100644 --- a/sysutils/digdag/files/digdag.conf.sample +++ b/sysutils/digdag/files/digdag.conf.sample @@ -50,6 +50,7 @@ #api.max_sessions_page_size (integer. The max number of rows of sessions in api response) server.bind=127.0.0.1 +database.type=h2 # generate with: # openssl rand -base64 16 #digdag.secret-encryption-key= diff --git a/sysutils/digdag/files/digdag.in b/sysutils/digdag/files/digdag.in index b1fc365a22f8..e5e5498ed4a5 100644 --- a/sysutils/digdag/files/digdag.in +++ b/sysutils/digdag/files/digdag.in @@ -25,11 +25,30 @@ load_rc_config ${name} : ${digdag_enable:="NO"} : ${digdag_user:="digdag"} : ${digdag_conf:="%%PREFIX%%/etc/digdag.conf"} -: ${digdag_logfile="/var/log/digdag/digdag.log"} +: ${digdag_logdir:="/var/log/digdag"} +: ${digdag_logfile:="${digdag_logdir}/digdag.log"} +: ${digdag_taskdir:="${digdag_logdir}/tasks"} +: ${digdag_dbdir:="/var/db/digdag"} 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}" +digdag_flags="-f -p ${pidfile} ${name} server --log ${digdag_logfile} --task-log ${digdag_taskdir} --database ${digdag_dbdir} --config ${digdag_conf}" + +start_precmd="digdag_prestart" + +digdag_prestart() +{ + for dir in ${digdag_logdir} ${digdag_taskdir} + do + if [ ! -d ${dir} ]; then + install -d -m 0755 -o ${digdag_user} ${dir} + fi + done + + if [ ! -d ${digdag_dbdir} ]; then + install -d -m 0750 -o ${digdag_user} ${digdag_dbdir} + fi +} run_rc_command "$1" diff --git a/sysutils/digdag/pkg-plist b/sysutils/digdag/pkg-plist index d7a4da5f3de4..db2a9c8d27d6 100644 --- a/sysutils/digdag/pkg-plist +++ b/sysutils/digdag/pkg-plist @@ -2,5 +2,4 @@ %%JAVAJARDIR%%/digdag/digdag-%%VERSION%%.jar bin/digdag @owner %%USERS%% -@dir /var/log/digdag @dir /var/run/digdag