diff options
Diffstat (limited to 'system/jenkins/files/jenkinsd.sh')
| -rw-r--r-- | system/jenkins/files/jenkinsd.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/system/jenkins/files/jenkinsd.sh b/system/jenkins/files/jenkinsd.sh index 87d6aa432a54c..0e616bc9aab7f 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 \$! |