summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/jenkins/README8
-rw-r--r--system/jenkins/files/jenkins.conf6
-rw-r--r--system/jenkins/files/jenkinsd.sh12
-rw-r--r--system/jenkins/jenkins.SlackBuild3
-rw-r--r--system/jenkins/jenkins.info12
5 files changed, 30 insertions, 11 deletions
diff --git a/system/jenkins/README b/system/jenkins/README
index a28a3572db..e900430c79 100644
--- a/system/jenkins/README
+++ b/system/jenkins/README
@@ -1,9 +1,11 @@
-Jenkins monitors executions of repeated jobs, such as building a software
-project or jobs run by cron. Among those things, current Jenkins focuses on the
-following two jobs:
+Jenkins monitors executions of repeated jobs, such as building a
+software project or jobs run by cron. Among those things, current
+Jenkins focuses on the following two jobs:
+
1. Building/testing software projects continuously
2. Monitoring executions of externally-run jobs,
+This slackbuild tracks the Jenkins LTS branch.
Groupname and Username
diff --git a/system/jenkins/files/jenkins.conf b/system/jenkins/files/jenkins.conf
index fbdbcb875b..8b9688362b 100644
--- a/system/jenkins/files/jenkins.conf
+++ b/system/jenkins/files/jenkins.conf
@@ -52,6 +52,12 @@ JENKINS_USER="jenkins"
## the SSL KeyManagerFactory type (eg SunX509, IbmX509). Default is SunX509
#JENKINS_HTTPS_KEY_MANAGER="SunX509"
+## this along with JENKINS_HTTPS_CERTIFICATE can be used to run HTTPS with
+## OpenSSL secret key file and the corresponding certificate file
+#JENKINS_HTTPS_PRIVATE_KEY=""
+
+#JENKINS_HTTPS_CERTIFICATE=""
+
## Default home of jenkins stuffs
#JENKINS_HOME=/var/lib/jenkins
diff --git a/system/jenkins/files/jenkinsd.sh b/system/jenkins/files/jenkinsd.sh
index 87d6aa432a..0e616bc9aa 100644
--- a/system/jenkins/files/jenkinsd.sh
+++ b/system/jenkins/files/jenkinsd.sh
@@ -79,6 +79,14 @@ if [ "$JENKINS_HTTPS_KEY_MANAGER" != "" ] ; then
JENKINS_HTTPS_KEY_MANAGER_ARG="--httpsKeyManagerType=$JENKINS_HTTPS_KEY_MANAGER"
fi
+if [ "$JENKINS_HTTPS_PRIVATE_KEY" != "" ] ; then
+ JENKINS_HTTPS_PRIVATE_KEY="--httpsPrivateKey=$JENKINS_HTTPS_PRIVATE_KEY"
+fi
+
+if [ "$JENKINS_HTTPS_CERTIFICATE" != "" ] ; then
+ JENKINS_HTTPS_CERTIFICATE="--httpsCertificate=$JENKINS_HTTPS_CERTIFICATE"
+fi
+
if [ "$JENKINS_LOG_FILE" != "" ] ; then
JENKINS_LOG_FILE_ARG="--logfile=$JENKINS_LOG_FILE"
fi
@@ -106,12 +114,14 @@ su - $JENKINS_USER -c " \
$JENKINS_HTTPS_KEYSTORE_ARG \
$JENKINS_HTTPS_KEYSTORE_PASSWORD_ARG \
$JENKINS_HTTPS_KEY_MANAGER_ARG \
+ $JENKINS_HTTPS_PRIVATE_KEY \
+ $JENKINS_HTTPS_CERTIFICATE \
$JENKINS_LOG_FILE_ARG \
$JENKINS_WEBAPPSDIR_ARG \
$JENKINS_WEBROOT_ARG \
$OPT_ARGS \
</dev/null >> $JENKINS_CONSOLELOG_FILE 2>&1 &
-
+
echo \$! > $JENKINS_PID_FILE
disown \$!
diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild
index 83323c231d..7e2889a366 100644
--- a/system/jenkins/jenkins.SlackBuild
+++ b/system/jenkins/jenkins.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for jenkins
# Copyright 2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2017-2021 Andrew Clemons, Wellington, New Zealand
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=jenkins
-VERSION=${VERSION:-2.167}
+VERSION=${VERSION:-2.263.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info
index 5816591907..d8aed5559e 100644
--- a/system/jenkins/jenkins.info
+++ b/system/jenkins/jenkins.info
@@ -1,10 +1,10 @@
PRGNAM="jenkins"
-VERSION="2.167"
-HOMEPAGE="http://jenkins-ci.org"
-DOWNLOAD="http://mirrors.jenkins.io/war/2.167/jenkins.war"
-MD5SUM="58148bfebf48597905ba79df1c64be52"
+VERSION="2.263.4"
+HOMEPAGE="https://www.jenkins.io/"
+DOWNLOAD="http://mirrors.jenkins.io/war-stable/2.263.4/jenkins.war"
+MD5SUM="c6980fe4b5e503efff10d0f56f5cf427"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jdk"
-MAINTAINER="Giorgio Peron"
-EMAIL="giorgio.peron@gmail.com"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"