Attachment 222919 Details for Bug 251780 – sysutils/rundeck3 update to 3.3.9

[patch] sysutils/rundeck3 update to 3.3.9

rundeck3.diff (text/plain), 11.56 KB, created by Daniel Tihanyi on 2021-03-02 16:21:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Tihanyi

Created: 2021-03-02 16:21:30 UTC

Size: 11.56 KB

patch

obsolete

>Index: sysutils/rundeck3/Makefile
>===================================================================
>--- sysutils/rundeck3/Makefile	(revision 566969)
>+++ sysutils/rundeck3/Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	rundeck
>-DISTVERSION=	3.3.5
>-DISTVERSIONSUFFIX=	20201019
>+DISTVERSION=	3.3.9
>+DISTVERSIONSUFFIX=	20210201
> CATEGORIES=	sysutils java
> MASTER_SITES=	https://dl.bintray.com/rundeck/rundeck-maven/org/rundeck/rundeck/ \
> 		https://download.rundeck.org/war/
>@@ -23,13 +23,15 @@
> NO_ARCH=	yes
> NO_BUILD=	yes
> 
>-PLIST_SUB=	RUNDECK_USER=${RUNDECK_USER} RUNDECK_GROUP=${RUNDECK_GROUP}
> USE_RC_SUBR=	rundeck
> 
> RUNDECK_HOME=	${PREFIX}/rundeck
> RUNDECK_USER?=	rundeck
> RUNDECK_GROUP?=	rundeck
>-RUNDECK_LOG_FILE?=	/var/log/rundeck.log
>+RUNDECK_LOGDIR?=	/var/log/rundeck
>+RUNDECK_LOG_FILE?=	${RUNDECK_LOGDIR}/rundeck.log
>+RUNDECK_LOG4J=	log4j2.properties
>+RUNDECK_CONFIG_DIR=	${RUNDECK_HOME}/server/config
> 
> .if ${RUNDECK_USER} == "rundeck"
> USERS=	rundeck
>@@ -38,17 +40,27 @@
> GROUPS=	rundeck
> .endif
> 
>-PLIST_FILES=	${DATADIR}/rundeck.war
>-PLIST_DIRS=	${RUNDECK_HOME}/server/lib \
>-		${RUNDECK_HOME}/server
>+PLIST_SUB=	RUNDECK_USER=${RUNDECK_USER} RUNDECK_GROUP=${RUNDECK_GROUP} \
>+		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} RUNDECK_HOME=${RUNDECK_HOME}
> 
>+SUB_FILES=	${RUNDECK_LOG4J}
> SUB_LIST+=	RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_USER=${RUNDECK_USER} \
> 		RUNDECK_GROUP=${RUNDECK_GROUP} JAVA_HOME=${JAVA_HOME} \
>-		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE}
>+		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE} \
>+		RUNDECK_LOG4J=${RUNDECK_LOG4J} \
>+		RUNDECK_CONFIG_DIR=${RUNDECK_CONFIG_DIR} \
>+		RUNDECK_LOGDIR=${RUNDECK_LOGDIR}
> 
> do-install:
>-	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
>+	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
>+	${MKDIR} ${STAGEDIR}${RUNDECK_LOGDIR}
> 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
> 		${STAGEDIR}${DATADIR}/rundeck${EXTRACT_SUFX}
> 
>+post-install:
>+	${MKDIR} ${STAGEDIR}${RUNDECK_CONFIG_DIR}
>+	${INSTALL_DATA} \
>+		${WRKDIR}/${RUNDECK_LOG4J} \
>+		${STAGEDIR}${RUNDECK_CONFIG_DIR}/${RUNDECK_LOG4J}
>+
> .include <bsd.port.mk>
>Index: sysutils/rundeck3/distinfo
>===================================================================
>--- sysutils/rundeck3/distinfo	(revision 566969)
>+++ sysutils/rundeck3/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1603194037
>-SHA256 (rundeck-3.3.5-20201019.war) = 075d3304d4415025fb083e759b1687c1fe09e683742c326b336de2baac11e5ac
>-SIZE (rundeck-3.3.5-20201019.war) = 169109261
>+TIMESTAMP = 1614505436
>+SHA256 (rundeck-3.3.9-20210201.war) = 9a3f4f46da402f5416c554dc750e9e916e868ec7de6c5ac1e7f8509f469c6dc1
>+SIZE (rundeck-3.3.9-20210201.war) = 176257194
>Index: sysutils/rundeck3/files/log4j2.properties.in
>===================================================================
>--- sysutils/rundeck3/files/log4j2.properties.in	(nonexistent)
>+++ sysutils/rundeck3/files/log4j2.properties.in	(working copy)
>@@ -0,0 +1,188 @@
>+####################################################################################################
>+#
>+#  Log Levels
>+#
>+####################################################################################################
>+
>+# Enable logging for everything. Rarely useful
>+log4j.rootLogger=warn, stdout, server-logger
>+
>+log4j.com.dtolabs.rundeck.core=INFO, cmd-logger
>+
>+#log4j.logger.org.codehaus.groovy.grails.plugins.quartz=debug,stdout
>+#log4j.additivity.org.codehaus.groovy.grails.plugins.quartz=false
>+
>+# Enable audit logging
>+log4j.logger.com.dtolabs.rundeck.core.authorization=info, audit
>+log4j.additivity.com.dtolabs.rundeck.core.authorization=false
>+
>+# Enable options remote URL logging
>+log4j.logger.com.dtolabs.rundeck.remoteservice.http.options=INFO, options
>+log4j.additivity.com.dtolabs.rundeck.remoteservice.http.options=false
>+
>+# Enable Job changes logging
>+log4j.logger.com.dtolabs.rundeck.data.jobs.changes=INFO, jobchanges
>+log4j.additivity.com.dtolabs.rundeck.data.jobs.changes=false
>+
>+# Enable Execution event logging
>+log4j.logger.org.rundeck.execution.status=INFO, execevents
>+log4j.additivity.org.rundeck.execution.status=false
>+
>+# Enable API request logging
>+log4j.logger.org.rundeck.api.requests=INFO,apirequests
>+log4j.additivity.org.rundeck.api.requests=false
>+
>+# Enable Web access logging
>+log4j.logger.org.rundeck.web.requests=INFO,access
>+log4j.additivity.org.rundeck.web.requests=false
>+
>+# Enable Storage logging
>+log4j.logger.org.rundeck.storage.events=INFO,storage
>+log4j.additivity.org.rundeck.storage.events=false
>+
>+# Enable Project manager logging
>+log4j.logger.grails.app.services.rundeck.services.ProjectManagerService=INFO,stdout, server-logger
>+log4j.additivity.grails.app.services.rundeck.services.ProjectManagerService=false
>+
>+# Enable this logger to log Hibernate output
>+# handy to see its database interaction activity
>+#log4j.logger.org.hibernate=debug,stdout
>+#log4j.additivity.org.hibernate=false
>+
>+# Enable this logger to see what Spring does, occasionally useful
>+#log4j.logger.org.springframework=info,stdout 
>+#log4j.additivity.org.springframework=false
>+
>+# This logger covers all of Grails' internals
>+# Enable to see whats going on underneath. 
>+log4j.logger.org.codehaus.groovy.grails=warn,stdout, server-logger
>+log4j.additivity.org.codehaus.groovy.grails=false
>+
>+# This logger is useful if you just want to see what Grails
>+# configures with Spring at runtime. Setting to debug will show
>+# each bean that is configured
>+log4j.logger.org.codehaus.groovy.grails.commons.spring=warn,stdout, server-logger
>+log4j.additivity.org.codehaus.groovy.grails.commons.spring=false  
>+                          
>+# Interesting Logger to see what some of the Grails factory beans are doing
>+log4j.logger.org.codehaus.groovy.grails.beans.factory=warn,stdout, server-logger
>+log4j.additivity.org.codehaus.groovy.grails.beans.factory=false
>+
>+# This logger is for Grails' public APIs within the grails. package
>+log4j.logger.grails=info,stdout, server-logger
>+log4j.additivity.grails=false
>+
>+
>+####################################################################################################
>+#
>+#  Appender Configuration (unlikely a change needs to be made, unless you have unique logging reqs.)
>+#
>+####################################################################################################
>+
>+#
>+# stdout - ConsoleAppender
>+#
>+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
>+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
>+log4j.appender.stdout.layout.ConversionPattern=%-5p %c{1}: %m%n
>+
>+#
>+# cmd-logger - DailyRollingFileAppender
>+#
>+# Output of the RunDeck command line utilities
>+#
>+log4j.appender.cmd-logger=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.cmd-logger.file=/var/log/rundeck/command.log
>+log4j.appender.cmd-logger.datePattern='.'yyyy-MM-dd
>+log4j.appender.cmd-logger.append=true
>+log4j.appender.cmd-logger.layout=org.apache.log4j.PatternLayout
>+log4j.appender.cmd-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
>+
>+#
>+# server-logger - DailyRollingFileAppender
>+# 
>+# Captures all output from the rundeckd server.
>+#
>+log4j.appender.server-logger=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.server-logger.file=/var/log/rundeck/rundeck.log
>+log4j.appender.server-logger.datePattern='.'yyyy-MM-dd
>+log4j.appender.server-logger.append=true
>+log4j.appender.server-logger.layout=org.apache.log4j.PatternLayout
>+log4j.appender.server-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
>+
>+#
>+# audit 
>+# 
>+# Captures all audit events.
>+#
>+log4j.appender.audit=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.audit.file=/var/log/rundeck/rundeck.audit.log
>+log4j.appender.audit.append=true
>+log4j.appender.audit.layout=org.apache.log4j.PatternLayout
>+log4j.appender.audit.layout.ConversionPattern=%d{ISO8601} - %m%n
>+
>+#
>+# options log
>+#
>+# Logs remote HTTP requests for Options JSON data
>+#
>+log4j.appender.options=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.options.file=/var/log/rundeck/rundeck.options.log
>+log4j.appender.options.append=true
>+log4j.appender.options.layout=org.apache.log4j.PatternLayout
>+log4j.appender.options.layout.ConversionPattern=[%d{ISO8601}] %X{httpStatusCode} %X{contentLength}B %X{durationTime}ms %X{lastModifiedDateTime} [%X{jobName}] %X{url} %X{contentSHA1}%n
>+
>+#
>+# storage log
>+#
>+# Logs events for Rundeck storage layer
>+#
>+log4j.appender.storage=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.storage.file=/var/log/rundeck/rundeck.storage.log
>+log4j.appender.storage.append=true
>+log4j.appender.storage.layout=org.apache.log4j.PatternLayout
>+log4j.appender.storage.layout.ConversionPattern=[%d{ISO8601}] %X{action} %X{type} %X{path} %X{status} %X{metadata}%n
>+
>+#
>+# job changes log
>+#
>+# Logs all Job definition changes
>+#
>+log4j.appender.jobchanges=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.jobchanges.file=/var/log/rundeck/rundeck.jobs.log
>+log4j.appender.jobchanges.append=true
>+log4j.appender.jobchanges.layout=org.apache.log4j.PatternLayout
>+log4j.appender.jobchanges.layout.ConversionPattern=[%d{ISO8601}] %X{user} %X{change} [%X{id}] %X{project} "%X{groupPath}/%X{jobName}" (%X{method})%n
>+
>+#
>+# executions log
>+#
>+# Logs all execution events (start,finish,delete)
>+#
>+log4j.appender.execevents=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.execevents.file=/var/log/rundeck/rundeck.executions.log
>+log4j.appender.execevents.append=true
>+log4j.appender.execevents.layout=org.apache.log4j.PatternLayout
>+log4j.appender.execevents.layout.ConversionPattern=[%d{ISO8601}] %X{eventUser} %X{event} [%X{id}:%X{state}] %X{project} %X{user}/%X{abortedby} "%X{groupPath}/%X{jobName}"[%X{uuid}]%n
>+
>+#
>+# api request log
>+#
>+# Logs all API requests
>+#
>+log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.apirequests.file=/var/log/rundeck/rundeck.api.log
>+log4j.appender.apirequests.append=true
>+log4j.appender.apirequests.layout=org.apache.log4j.PatternLayout
>+log4j.appender.apirequests.layout.ConversionPattern=[%d{ISO8601}] %X{remoteHost} %X{secure} %X{remoteUser} %X{authToken} %X{duration} %X{project} "%X{method} %X{uri}" (%X{userAgent})%n
>+
>+#
>+# Web access log
>+#
>+# Logs all Web requests
>+#
>+log4j.appender.access=org.apache.log4j.DailyRollingFileAppender
>+log4j.appender.access.file=/var/log/rundeck/rundeck.access.log
>+log4j.appender.access.append=true
>+log4j.appender.access.layout=org.apache.log4j.PatternLayout
>+log4j.appender.access.layout.ConversionPattern=[%d{ISO8601}] "%X{method} %X{uri}" %X{remoteHost} %X{secure} %X{remoteUser} %X{authToken} %X{duration} %X{project} [%X{contentType}] (%X{userAgent})%n
>
>Property changes on: sysutils/rundeck3/files/log4j2.properties.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/rundeck3/pkg-plist
>===================================================================
>--- sysutils/rundeck3/pkg-plist	(nonexistent)
>+++ sysutils/rundeck3/pkg-plist	(working copy)
>@@ -0,0 +1,11 @@
>+@owner %%RUNDECK_USER%%
>+@group %%RUNDECK_GROUP%%
>+@dir %%RUNDECK_HOME%%
>+@dir %%RUNDECK_HOME%%/server
>+@dir %%RUNDECK_HOME%%/server/config
>+%%RUNDECK_HOME%%/server/config/log4j2.properties
>+@dir %%RUNDECK_HOME%%/server/lib
>+@dir %%RUNDECK_LOGDIR%%
>+@owner
>+@group
>+%%DATADIR%%/%%RUNDECK_USER%%.war
>
>Property changes on: sysutils/rundeck3/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

daniel.tihanyi: maintainer-approval+

Actions: View | Diff

Attachments on bug 251780: 220482 | 222919