Attachment 231579 Details for Bug 261748 – [PATCH] Don't redirect to logfile, but have daemon manage it in a logrotate friendly manner

[patch] [PATCH] Don't redirect to logfile, but have daemon manage it in a logrotate friendly manner

fix_rundeck_startup.txt (text/plain), 1.62 KB, created by ruben on 2022-02-06 16:46:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ruben

Created: 2022-02-06 16:46:05 UTC

Size: 1.62 KB

patch

obsolete

>From f6bf53f301606b32761fb50d567797c2a13b760d Mon Sep 17 00:00:00 2001
>From: Ruben van Staveren <ruben@verweg.com>
>Date: Thu, 13 Jan 2022 22:34:23 +0100
>Subject: [PATCH] Don't redirect to logfile, but have daemon manage it in a
> logrotate friendly manner
>
>
>diff --git a/sysutils/rundeck3/Makefile b/sysutils/rundeck3/Makefile
>index 5e423a1cf401..62ec4c6976a3 100644
>--- a/sysutils/rundeck3/Makefile
>+++ b/sysutils/rundeck3/Makefile
>@@ -32,6 +32,14 @@ SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
> 		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
> 		RUNDECK_USER=${RUNDECK_USER}
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 1203000
>+SUB_LIST+=	DAEMON_H_FLAG=""
>+.else
>+SUB_LIST+=	DAEMON_H_FLAG="-H "
>+.endif
>+
> RUNDECK_HOME=		${PREFIX}/rundeck
> RUNDECK_USER?=		rundeck
> RUNDECK_GROUP?=		rundeck
>@@ -64,4 +72,4 @@ post-install:
> 		${WRKDIR}/${RUNDECK_LOG4J} \
> 		${STAGEDIR}${RUNDECK_CONFIG_DIR}/${RUNDECK_LOG4J}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff --git a/sysutils/rundeck3/files/rundeck.in b/sysutils/rundeck3/files/rundeck.in
>index 60e78bcb13d9..ec5637b1f224 100644
>--- a/sysutils/rundeck3/files/rundeck.in
>+++ b/sysutils/rundeck3/files/rundeck.in
>@@ -58,7 +58,7 @@ pidfile="/var/run/rundeck/rundeck.pid"
> command="/usr/sbin/daemon"
> java_cmd="${rundeck_java_home}/bin/java"
> procname="${java_cmd}"
>-command_args="-p ${pidfile} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args} > ${rundeck_log_file} 2>&1"
>+command_args="-p ${pidfile} %%DAEMON_H_FLAG%%-o ${rundeck_log_file} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args} 
> required_files="${java_cmd}"
> 
> start_precmd="rundeck_prestart"

Flags:

koobs: maintainer-approval? (daniel.tihanyi)

Actions: View | Diff

Attachments on bug 261748: 231579 | 231916