diff options
Diffstat (limited to 'system/jenkins/files')
| -rw-r--r-- | system/jenkins/files/jenkins.conf | 6 | ||||
| -rw-r--r-- | system/jenkins/files/jenkinsd.sh | 10 |
2 files changed, 0 insertions, 16 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 \ |