Attachment 214111 Details for Bug 246023 – rundeck-rundeck3-diff

[patch] rundeck-rundeck3-diff

rundeck-rundeck3-diff.txt (text/plain), 13.04 KB, created by Daniel Tihanyi on 2020-05-04 15:58:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Tihanyi

Created: 2020-05-04 15:58:48 UTC

Size: 13.04 KB

patch

obsolete

>Index: sysutils/rundeck/Makefile
>===================================================================
>--- sysutils/rundeck/Makefile	(revision 533928)
>+++ sysutils/rundeck/Makefile	(nonexistent)
>@@ -1,45 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	rundeck
>-DISTVERSION=	2.11.14
>-CATEGORIES=	sysutils java
>-MASTER_SITES=	http://dl.bintray.com/rundeck/rundeck-maven/
>-DISTNAME=	rundeck-launcher-${PORTVERSION}
>-EXTRACT_SUFX=	.jar
>-
>-MAINTAINER=	arcade@b1t.name
>-COMMENT=	Web-console for dispatching commands and scripts to your nodes
>-
>-LICENSE=	APACHE20
>-
>-USE_JAVA=	yes
>-JAVA_VERSION=	1.8+
>-
>-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
>-
>-.if ${RUNDECK_USER} == "rundeck"
>-USERS=	rundeck
>-.endif
>-.if ${RUNDECK_GROUP} == "rundeck"
>-GROUPS=	rundeck
>-.endif
>-
>-SUB_LIST+=	RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_USER=${RUNDECK_USER} \
>-		RUNDECK_GROUP=${RUNDECK_GROUP} JAVA_HOME=${JAVA_HOME} \
>-		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE}
>-
>-do-install:
>-	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
>-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
>-		${STAGEDIR}${DATADIR}/rundeck-launcher${EXTRACT_SUFX}
>-
>-.include <bsd.port.mk>
>
>Property changes on: sysutils/rundeck/Makefile
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/rundeck/distinfo
>===================================================================
>--- sysutils/rundeck/distinfo	(revision 533928)
>+++ sysutils/rundeck/distinfo	(nonexistent)
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1570615790
>-SHA256 (rundeck-launcher-2.11.14.jar) = 53b3436cf7234f8fd26986e0b35bb5d42569570ca99e8580c6a616ae98b6973f
>-SIZE (rundeck-launcher-2.11.14.jar) = 102513074
>
>Property changes on: sysutils/rundeck/distinfo
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/rundeck/files/rundeck.in
>===================================================================
>--- sysutils/rundeck/files/rundeck.in	(revision 533928)
>+++ sysutils/rundeck/files/rundeck.in	(nonexistent)
>@@ -1,84 +0,0 @@
>-#!/bin/sh
>-
>-# PROVIDE: rundeck
>-# REQUIRE: LOGIN
>-# KEYWORD: shutdown
>-
>-#
>-# Configuration settings for rundeck in /etc/rc.conf:
>-#
>-# rundeck_enable (bool):
>-#   Set to "NO" by default.
>-#   Set it to "YES" to enable rundeck
>-#
>-# rundeck_args (str):
>-#   Extra arguments passed to start command
>-#
>-# rundeck_home (str)
>-#   Set to "%%RUNDECK_HOME%%" by default.
>-#   Set the RUNDECK_HOME variable for rundeck process
>-#
>-# rundeck_java_home (str):
>-#   Set to "%%JAVA_HOME%%" by default.
>-#   Set the Java virtual machine to run rundeck
>-#
>-# rundeck_java_opts (str):
>-#   Set to "" by default.
>-#   Java VM args to use.
>-#
>-# rundeck_user (str):
>-#   Set to "%%RUNDECK_USER%%" by default.
>-#   User to run rundeck as.
>-#
>-# rundeck_group (str):
>-#   Set to "%%RUNDECK_GROUP%%" by default.
>-#   Group for data file ownership.
>-#
>-# rundeck_log_file (str):
>-#   Set to "%%RUNDECK_LOG_FILE%%" by default.
>-#   Log file location.
>-#
>-
>-. /etc/rc.subr
>-
>-name="rundeck"
>-rcvar=rundeck_enable
>-
>-load_rc_config "${name}"
>-
>-: ${rundeck_args="-b %%RUNDECK_HOME%%"}
>-: ${rundeck_enable="NO"}
>-: ${rundeck_home="%%RUNDECK_HOME%%"}
>-: ${rundeck_java_home="%%JAVA_HOME%%"}
>-: ${rundeck_user="%%RUNDECK_USER%%"}
>-: ${rundeck_group="%%RUNDECK_GROUP%%"}
>-: ${rundeck_log_file="%%RUNDECK_LOG_FILE%%"}
>-
>-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-launcher.jar ${rundeck_args} > ${rundeck_log_file} 2>&1"
>-required_files="${java_cmd}"
>-
>-start_precmd="rundeck_prestart"
>-start_cmd="rundeck_start"
>-
>-rundeck_prestart() {
>-	if [ ! -f "${rundeck_log_file}" ]; then
>-		touch "${rundeck_log_file}"
>-		chown "${rundeck_user}:${rundeck_group}" "${rundeck_log_file}"
>-		chmod 640 "${rundeck_log_file}"
>-	fi
>-	if [ ! -d "/var/run/rundeck" ]; then
>-		install -d -o "${rundeck_user}" -g "${rundeck_group}" -m 750 "/var/run/rundeck"
>-	fi
>-}
>-
>-rundeck_start()
>-{
>-	check_startmsgs && echo "Starting ${name}."
>-	su -l ${rundeck_user} -c "exec ${command} ${command_args} ${rc_arg}"
>-}
>-
>-run_rc_command "$1"
>
>Property changes on: sysutils/rundeck/files/rundeck.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/rundeck/pkg-descr
>===================================================================
>--- sysutils/rundeck/pkg-descr	(revision 533928)
>+++ sysutils/rundeck/pkg-descr	(nonexistent)
>@@ -1,6 +0,0 @@
>-Welcome to Rundeck, the human interface to your operations. Rundeck
>-features fine-grain access controls, a built-in job scheduler, and the
>-ability to define workflows that dispatch commands and scripts to your
>-nodes.
>-
>-WWW: http://rundeck.org
>
>Property changes on: sysutils/rundeck/pkg-descr
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/rundeck/pkg-plist
>===================================================================
>--- sysutils/rundeck/pkg-plist	(revision 533928)
>+++ sysutils/rundeck/pkg-plist	(nonexistent)
>@@ -1,3 +0,0 @@
>-%%DATADIR%%/rundeck-launcher.jar
>-@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server/lib
>-@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server
>
>Property changes on: sysutils/rundeck/pkg-plist
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/rundeck3/Makefile
>===================================================================
>--- sysutils/rundeck3/Makefile	(nonexistent)
>+++ sysutils/rundeck3/Makefile	(working copy)
>@@ -0,0 +1,46 @@
>+# $FreeBSD$
>+
>+PORTNAME=	rundeck
>+DISTVERSION=	3.2.6
>+DISTVERSIONSUFFIX=	20200427
>+CATEGORIES=	sysutils java
>+MASTER_SITES=	http://dl.bintray.com/rundeck/rundeck-maven/
>+DISTNAME=	${PORTNAME}-${DISTVERSION}-${DISTVERSIONSUFFIX}
>+EXTRACT_SUFX=	.war
>+
>+MAINTAINER=	arcade@b1t.name
>+COMMENT=	Web-console for dispatching commands and scripts to your nodes
>+
>+LICENSE=	APACHE20
>+
>+USE_JAVA=	yes
>+JAVA_VERSION=	1.8+
>+
>+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
>+
>+.if ${RUNDECK_USER} == "rundeck"
>+USERS=	rundeck
>+.endif
>+.if ${RUNDECK_GROUP} == "rundeck"
>+GROUPS=	rundeck
>+.endif
>+
>+SUB_LIST+=	RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_USER=${RUNDECK_USER} \
>+		RUNDECK_GROUP=${RUNDECK_GROUP} JAVA_HOME=${JAVA_HOME} \
>+		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE}
>+
>+do-install:
>+	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
>+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
>+		${STAGEDIR}${DATADIR}/rundeck${EXTRACT_SUFX}
>+
>+.include <bsd.port.mk>
>
>Property changes on: sysutils/rundeck3/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/rundeck3/distinfo
>===================================================================
>--- sysutils/rundeck3/distinfo	(nonexistent)
>+++ sysutils/rundeck3/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1588154995
>+SHA256 (rundeck-3.2.6-20200427.war) = a866c32d866d7b28470e439eeb8c490625d2b116dcc0451a17e198891573cafb
>+SIZE (rundeck-3.2.6-20200427.war) = 165490944
>
>Property changes on: sysutils/rundeck3/distinfo
>___________________________________________________________________
>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
>Index: sysutils/rundeck3/files/rundeck.in
>===================================================================
>--- sysutils/rundeck3/files/rundeck.in	(nonexistent)
>+++ sysutils/rundeck3/files/rundeck.in	(working copy)
>@@ -0,0 +1,84 @@
>+#!/bin/sh
>+
>+# PROVIDE: rundeck
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+
>+#
>+# Configuration settings for rundeck in /etc/rc.conf:
>+#
>+# rundeck_enable (bool):
>+#   Set to "NO" by default.
>+#   Set it to "YES" to enable rundeck
>+#
>+# rundeck_args (str):
>+#   Extra arguments passed to start command
>+#
>+# rundeck_home (str)
>+#   Set to "%%RUNDECK_HOME%%" by default.
>+#   Set the RUNDECK_HOME variable for rundeck process
>+#
>+# rundeck_java_home (str):
>+#   Set to "%%JAVA_HOME%%" by default.
>+#   Set the Java virtual machine to run rundeck
>+#
>+# rundeck_java_opts (str):
>+#   Set to "" by default.
>+#   Java VM args to use.
>+#
>+# rundeck_user (str):
>+#   Set to "%%RUNDECK_USER%%" by default.
>+#   User to run rundeck as.
>+#
>+# rundeck_group (str):
>+#   Set to "%%RUNDECK_GROUP%%" by default.
>+#   Group for data file ownership.
>+#
>+# rundeck_log_file (str):
>+#   Set to "%%RUNDECK_LOG_FILE%%" by default.
>+#   Log file location.
>+#
>+
>+. /etc/rc.subr
>+
>+name="rundeck"
>+rcvar=rundeck_enable
>+
>+load_rc_config "${name}"
>+
>+: ${rundeck_args="-b %%RUNDECK_HOME%%"}
>+: ${rundeck_enable="NO"}
>+: ${rundeck_home="%%RUNDECK_HOME%%"}
>+: ${rundeck_java_home="%%JAVA_HOME%%"}
>+: ${rundeck_user="%%RUNDECK_USER%%"}
>+: ${rundeck_group="%%RUNDECK_GROUP%%"}
>+: ${rundeck_log_file="%%RUNDECK_LOG_FILE%%"}
>+
>+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"
>+required_files="${java_cmd}"
>+
>+start_precmd="rundeck_prestart"
>+start_cmd="rundeck_start"
>+
>+rundeck_prestart() {
>+	if [ ! -f "${rundeck_log_file}" ]; then
>+		touch "${rundeck_log_file}"
>+		chown "${rundeck_user}:${rundeck_group}" "${rundeck_log_file}"
>+		chmod 640 "${rundeck_log_file}"
>+	fi
>+	if [ ! -d "/var/run/rundeck" ]; then
>+		install -d -o "${rundeck_user}" -g "${rundeck_group}" -m 750 "/var/run/rundeck"
>+	fi
>+}
>+
>+rundeck_start()
>+{
>+	check_startmsgs && echo "Starting ${name}."
>+	su -l ${rundeck_user} -c "exec ${command} ${command_args} ${rc_arg}"
>+}
>+
>+run_rc_command "$1"
>
>Property changes on: sysutils/rundeck3/files/rundeck.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-descr
>===================================================================
>--- sysutils/rundeck3/pkg-descr	(nonexistent)
>+++ sysutils/rundeck3/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+Welcome to Rundeck, the human interface to your operations. Rundeck
>+features fine-grain access controls, a built-in job scheduler, and the
>+ability to define workflows that dispatch commands and scripts to your
>+nodes.
>+
>+WWW: http://rundeck.org
>
>Property changes on: sysutils/rundeck3/pkg-descr
>___________________________________________________________________
>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
>Index: sysutils/rundeck3/pkg-plist
>===================================================================
>--- sysutils/rundeck3/pkg-plist	(nonexistent)
>+++ sysutils/rundeck3/pkg-plist	(working copy)
>@@ -0,0 +1,3 @@
>+etc/rc.d/%%RUNDECK_USER%%
>+%%DATADIR%%/%%RUNDECK_USER%%.war
>+@dir %%RUNDECK_USER%%/server/lib
>
>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
>

Actions: View | Diff

Attachments on bug 246023: 213907 | 214111 | 214199