diff options
| author |   Andrew Clemons | 2022-09-25 12:33:27 +0200 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2022-10-01 04:01:18 +0200 |
| commit | 06a8337780dc8b63d29098ce27e6acdb4ee104f6 (patch) | |
| tree | 87dae43d861b560533310c467aba956e47fd03a0 | |
| parent | fa6f3ca0c1adaad8085c4d0b6727286c52ae342d (diff) | |
| download | slackbuilds-06a8337780dc8b63d29098ce27e6acdb4ee104f6.tar.gz | |
system/jenkins: Update examples configs.
jenkins 2.361 removed support for using pem certs.
https://github.com/jenkinsci/winstone/pull/232
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/jenkins/files/jenkins.conf | 6 | ||||
| -rw-r--r-- | system/jenkins/files/jenkinsd.sh | 10 | ||||
| -rw-r--r-- | system/jenkins/jenkins.SlackBuild | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/system/jenkins/files/jenkins.conf b/system/jenkins/files/jenkins.conf index 8b9688362b..fbdbcb875b 100644 --- a/system/jenkins/files/jenkins.conf +++ b/system/jenkins/files/jenkins.conf @@ -52,12 +52,6 @@ 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 0e616bc9aa..1bed3e1f13 100644 --- a/system/jenkins/files/jenkinsd.sh +++ b/system/jenkins/files/jenkinsd.sh @@ -79,14 +79,6 @@ 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 @@ -114,8 +106,6 @@ 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 \ diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild index ee7676cd22..4072313692 100644 --- a/system/jenkins/jenkins.SlackBuild +++ b/system/jenkins/jenkins.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jenkins VERSION=${VERSION:-2.361.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} |