View | Details | Raw Unified | Return to bug 251780 | Differences between
and this patch

Collapse All | Expand All

(-)sysutils/rundeck3/Makefile (-9 / +21 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	rundeck
3
PORTNAME=	rundeck
4
DISTVERSION=	3.3.5
4
DISTVERSION=	3.3.9
5
DISTVERSIONSUFFIX=	20201019
5
DISTVERSIONSUFFIX=	20210201
6
CATEGORIES=	sysutils java
6
CATEGORIES=	sysutils java
7
MASTER_SITES=	https://dl.bintray.com/rundeck/rundeck-maven/org/rundeck/rundeck/ \
7
MASTER_SITES=	https://dl.bintray.com/rundeck/rundeck-maven/org/rundeck/rundeck/ \
8
		https://download.rundeck.org/war/
8
		https://download.rundeck.org/war/
Lines 23-35 Link Here
23
NO_ARCH=	yes
23
NO_ARCH=	yes
24
NO_BUILD=	yes
24
NO_BUILD=	yes
25
25
26
PLIST_SUB=	RUNDECK_USER=${RUNDECK_USER} RUNDECK_GROUP=${RUNDECK_GROUP}
27
USE_RC_SUBR=	rundeck
26
USE_RC_SUBR=	rundeck
28
27
29
RUNDECK_HOME=	${PREFIX}/rundeck
28
RUNDECK_HOME=	${PREFIX}/rundeck
30
RUNDECK_USER?=	rundeck
29
RUNDECK_USER?=	rundeck
31
RUNDECK_GROUP?=	rundeck
30
RUNDECK_GROUP?=	rundeck
32
RUNDECK_LOG_FILE?=	/var/log/rundeck.log
31
RUNDECK_LOGDIR?=	/var/log/rundeck
32
RUNDECK_LOG_FILE?=	${RUNDECK_LOGDIR}/rundeck.log
33
RUNDECK_LOG4J=	log4j2.properties
34
RUNDECK_CONFIG_DIR=	${RUNDECK_HOME}/server/config
33
35
34
.if ${RUNDECK_USER} == "rundeck"
36
.if ${RUNDECK_USER} == "rundeck"
35
USERS=	rundeck
37
USERS=	rundeck
Lines 38-54 Link Here
38
GROUPS=	rundeck
40
GROUPS=	rundeck
39
.endif
41
.endif
40
42
41
PLIST_FILES=	${DATADIR}/rundeck.war
43
PLIST_SUB=	RUNDECK_USER=${RUNDECK_USER} RUNDECK_GROUP=${RUNDECK_GROUP} \
42
PLIST_DIRS=	${RUNDECK_HOME}/server/lib \
44
		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} RUNDECK_HOME=${RUNDECK_HOME}
43
		${RUNDECK_HOME}/server
44
45
46
SUB_FILES=	${RUNDECK_LOG4J}
45
SUB_LIST+=	RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_USER=${RUNDECK_USER} \
47
SUB_LIST+=	RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_USER=${RUNDECK_USER} \
46
		RUNDECK_GROUP=${RUNDECK_GROUP} JAVA_HOME=${JAVA_HOME} \
48
		RUNDECK_GROUP=${RUNDECK_GROUP} JAVA_HOME=${JAVA_HOME} \
47
		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE}
49
		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE} \
50
		RUNDECK_LOG4J=${RUNDECK_LOG4J} \
51
		RUNDECK_CONFIG_DIR=${RUNDECK_CONFIG_DIR} \
52
		RUNDECK_LOGDIR=${RUNDECK_LOGDIR}
48
53
49
do-install:
54
do-install:
50
	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
55
	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
56
	${MKDIR} ${STAGEDIR}${RUNDECK_LOGDIR}
51
	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
57
	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
52
		${STAGEDIR}${DATADIR}/rundeck${EXTRACT_SUFX}
58
		${STAGEDIR}${DATADIR}/rundeck${EXTRACT_SUFX}
53
59
60
post-install:
61
	${MKDIR} ${STAGEDIR}${RUNDECK_CONFIG_DIR}
62
	${INSTALL_DATA} \
63
		${WRKDIR}/${RUNDECK_LOG4J} \
64
		${STAGEDIR}${RUNDECK_CONFIG_DIR}/${RUNDECK_LOG4J}
65
54
.include <bsd.port.mk>
66
.include <bsd.port.mk>
(-)sysutils/rundeck3/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1603194037
1
TIMESTAMP = 1614505436
2
SHA256 (rundeck-3.3.5-20201019.war) = 075d3304d4415025fb083e759b1687c1fe09e683742c326b336de2baac11e5ac
2
SHA256 (rundeck-3.3.9-20210201.war) = 9a3f4f46da402f5416c554dc750e9e916e868ec7de6c5ac1e7f8509f469c6dc1
3
SIZE (rundeck-3.3.5-20201019.war) = 169109261
3
SIZE (rundeck-3.3.9-20210201.war) = 176257194
(-)sysutils/rundeck3/files/log4j2.properties.in (+188 lines)
Line 0 Link Here
1
####################################################################################################
2
#
3
#  Log Levels
4
#
5
####################################################################################################
6
7
# Enable logging for everything. Rarely useful
8
log4j.rootLogger=warn, stdout, server-logger
9
10
log4j.com.dtolabs.rundeck.core=INFO, cmd-logger
11
12
#log4j.logger.org.codehaus.groovy.grails.plugins.quartz=debug,stdout
13
#log4j.additivity.org.codehaus.groovy.grails.plugins.quartz=false
14
15
# Enable audit logging
16
log4j.logger.com.dtolabs.rundeck.core.authorization=info, audit
17
log4j.additivity.com.dtolabs.rundeck.core.authorization=false
18
19
# Enable options remote URL logging
20
log4j.logger.com.dtolabs.rundeck.remoteservice.http.options=INFO, options
21
log4j.additivity.com.dtolabs.rundeck.remoteservice.http.options=false
22
23
# Enable Job changes logging
24
log4j.logger.com.dtolabs.rundeck.data.jobs.changes=INFO, jobchanges
25
log4j.additivity.com.dtolabs.rundeck.data.jobs.changes=false
26
27
# Enable Execution event logging
28
log4j.logger.org.rundeck.execution.status=INFO, execevents
29
log4j.additivity.org.rundeck.execution.status=false
30
31
# Enable API request logging
32
log4j.logger.org.rundeck.api.requests=INFO,apirequests
33
log4j.additivity.org.rundeck.api.requests=false
34
35
# Enable Web access logging
36
log4j.logger.org.rundeck.web.requests=INFO,access
37
log4j.additivity.org.rundeck.web.requests=false
38
39
# Enable Storage logging
40
log4j.logger.org.rundeck.storage.events=INFO,storage
41
log4j.additivity.org.rundeck.storage.events=false
42
43
# Enable Project manager logging
44
log4j.logger.grails.app.services.rundeck.services.ProjectManagerService=INFO,stdout, server-logger
45
log4j.additivity.grails.app.services.rundeck.services.ProjectManagerService=false
46
47
# Enable this logger to log Hibernate output
48
# handy to see its database interaction activity
49
#log4j.logger.org.hibernate=debug,stdout
50
#log4j.additivity.org.hibernate=false
51
52
# Enable this logger to see what Spring does, occasionally useful
53
#log4j.logger.org.springframework=info,stdout 
54
#log4j.additivity.org.springframework=false
55
56
# This logger covers all of Grails' internals
57
# Enable to see whats going on underneath. 
58
log4j.logger.org.codehaus.groovy.grails=warn,stdout, server-logger
59
log4j.additivity.org.codehaus.groovy.grails=false
60
61
# This logger is useful if you just want to see what Grails
62
# configures with Spring at runtime. Setting to debug will show
63
# each bean that is configured
64
log4j.logger.org.codehaus.groovy.grails.commons.spring=warn,stdout, server-logger
65
log4j.additivity.org.codehaus.groovy.grails.commons.spring=false  
66
                          
67
# Interesting Logger to see what some of the Grails factory beans are doing
68
log4j.logger.org.codehaus.groovy.grails.beans.factory=warn,stdout, server-logger
69
log4j.additivity.org.codehaus.groovy.grails.beans.factory=false
70
71
# This logger is for Grails' public APIs within the grails. package
72
log4j.logger.grails=info,stdout, server-logger
73
log4j.additivity.grails=false
74
75
76
####################################################################################################
77
#
78
#  Appender Configuration (unlikely a change needs to be made, unless you have unique logging reqs.)
79
#
80
####################################################################################################
81
82
#
83
# stdout - ConsoleAppender
84
#
85
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
86
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
87
log4j.appender.stdout.layout.ConversionPattern=%-5p %c{1}: %m%n
88
89
#
90
# cmd-logger - DailyRollingFileAppender
91
#
92
# Output of the RunDeck command line utilities
93
#
94
log4j.appender.cmd-logger=org.apache.log4j.DailyRollingFileAppender
95
log4j.appender.cmd-logger.file=/var/log/rundeck/command.log
96
log4j.appender.cmd-logger.datePattern='.'yyyy-MM-dd
97
log4j.appender.cmd-logger.append=true
98
log4j.appender.cmd-logger.layout=org.apache.log4j.PatternLayout
99
log4j.appender.cmd-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
100
101
#
102
# server-logger - DailyRollingFileAppender
103
# 
104
# Captures all output from the rundeckd server.
105
#
106
log4j.appender.server-logger=org.apache.log4j.DailyRollingFileAppender
107
log4j.appender.server-logger.file=/var/log/rundeck/rundeck.log
108
log4j.appender.server-logger.datePattern='.'yyyy-MM-dd
109
log4j.appender.server-logger.append=true
110
log4j.appender.server-logger.layout=org.apache.log4j.PatternLayout
111
log4j.appender.server-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
112
113
#
114
# audit 
115
# 
116
# Captures all audit events.
117
#
118
log4j.appender.audit=org.apache.log4j.DailyRollingFileAppender
119
log4j.appender.audit.file=/var/log/rundeck/rundeck.audit.log
120
log4j.appender.audit.append=true
121
log4j.appender.audit.layout=org.apache.log4j.PatternLayout
122
log4j.appender.audit.layout.ConversionPattern=%d{ISO8601} - %m%n
123
124
#
125
# options log
126
#
127
# Logs remote HTTP requests for Options JSON data
128
#
129
log4j.appender.options=org.apache.log4j.DailyRollingFileAppender
130
log4j.appender.options.file=/var/log/rundeck/rundeck.options.log
131
log4j.appender.options.append=true
132
log4j.appender.options.layout=org.apache.log4j.PatternLayout
133
log4j.appender.options.layout.ConversionPattern=[%d{ISO8601}] %X{httpStatusCode} %X{contentLength}B %X{durationTime}ms %X{lastModifiedDateTime} [%X{jobName}] %X{url} %X{contentSHA1}%n
134
135
#
136
# storage log
137
#
138
# Logs events for Rundeck storage layer
139
#
140
log4j.appender.storage=org.apache.log4j.DailyRollingFileAppender
141
log4j.appender.storage.file=/var/log/rundeck/rundeck.storage.log
142
log4j.appender.storage.append=true
143
log4j.appender.storage.layout=org.apache.log4j.PatternLayout
144
log4j.appender.storage.layout.ConversionPattern=[%d{ISO8601}] %X{action} %X{type} %X{path} %X{status} %X{metadata}%n
145
146
#
147
# job changes log
148
#
149
# Logs all Job definition changes
150
#
151
log4j.appender.jobchanges=org.apache.log4j.DailyRollingFileAppender
152
log4j.appender.jobchanges.file=/var/log/rundeck/rundeck.jobs.log
153
log4j.appender.jobchanges.append=true
154
log4j.appender.jobchanges.layout=org.apache.log4j.PatternLayout
155
log4j.appender.jobchanges.layout.ConversionPattern=[%d{ISO8601}] %X{user} %X{change} [%X{id}] %X{project} "%X{groupPath}/%X{jobName}" (%X{method})%n
156
157
#
158
# executions log
159
#
160
# Logs all execution events (start,finish,delete)
161
#
162
log4j.appender.execevents=org.apache.log4j.DailyRollingFileAppender
163
log4j.appender.execevents.file=/var/log/rundeck/rundeck.executions.log
164
log4j.appender.execevents.append=true
165
log4j.appender.execevents.layout=org.apache.log4j.PatternLayout
166
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
167
168
#
169
# api request log
170
#
171
# Logs all API requests
172
#
173
log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
174
log4j.appender.apirequests.file=/var/log/rundeck/rundeck.api.log
175
log4j.appender.apirequests.append=true
176
log4j.appender.apirequests.layout=org.apache.log4j.PatternLayout
177
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
178
179
#
180
# Web access log
181
#
182
# Logs all Web requests
183
#
184
log4j.appender.access=org.apache.log4j.DailyRollingFileAppender
185
log4j.appender.access.file=/var/log/rundeck/rundeck.access.log
186
log4j.appender.access.append=true
187
log4j.appender.access.layout=org.apache.log4j.PatternLayout
188
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
(-)sysutils/rundeck3/pkg-plist (+11 lines)
Line 0 Link Here
1
@owner %%RUNDECK_USER%%
2
@group %%RUNDECK_GROUP%%
3
@dir %%RUNDECK_HOME%%
4
@dir %%RUNDECK_HOME%%/server
5
@dir %%RUNDECK_HOME%%/server/config
6
%%RUNDECK_HOME%%/server/config/log4j2.properties
7
@dir %%RUNDECK_HOME%%/server/lib
8
@dir %%RUNDECK_LOGDIR%%
9
@owner
10
@group
11
%%DATADIR%%/%%RUNDECK_USER%%.war

Return to bug 251780