Merge pull request #1227 from n8felton/JENKINS-11673

[FIXES JENKINS-11673] - Support https in RPM service scripts Originally-From: jenkins-ci.org/commit/core/3e191ba236d768c53dee92afb1651971c49999b9
jenkinsci · Jun 1, 2014 · 86cb8af · 86cb8af
2 parents cd737e1 + 9d5bc8c
commit 86cb8af
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/SOURCES/jenkins.init.in b/SOURCES/jenkins.init.in
@@ -75,6 +75,8 @@ PARAMS="--logfile=/var/log/jenkins/jenkins.log --webroot=/var/cache/jenkins/war
 [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
 [ -n "$JENKINS_LISTEN_ADDRESS" ] && PARAMS="$PARAMS --httpListenAddress=$JENKINS_LISTEN_ADDRESS"
 [ -n "$JENKINS_HTTPS_PORT" ] && PARAMS="$PARAMS --httpsPort=$JENKINS_HTTPS_PORT"
+[ -n "$JENKINS_HTTPS_KEYSTORE" ] && PARAMS="$PARAMS --httpsKeyStore=$JENKINS_HTTPS_KEYSTORE"
+[ -n "$JENKINS_HTTPS_KEYSTORE_PASSWORD" ] && PARAMS="$PARAMS --httpsKeyStorePassword='$JENKINS_HTTPS_KEYSTORE_PASSWORD'"
 [ -n "$JENKINS_HTTPS_LISTEN_ADDRESS" ] && PARAMS="$PARAMS --httpsListenAddress=$JENKINS_HTTPS_LISTEN_ADDRESS"
 [ -n "$JENKINS_AJP_PORT" ] && PARAMS="$PARAMS --ajp13Port=$JENKINS_AJP_PORT"
 [ -n "$JENKINS_AJP_LISTEN_ADDRESS" ] && PARAMS="$PARAMS --ajp13ListenAddress=$JENKINS_AJP_LISTEN_ADDRESS"

diff --git a/SOURCES/jenkins.sysconfig.in b/SOURCES/jenkins.sysconfig.in
@@ -63,6 +63,24 @@ JENKINS_LISTEN_ADDRESS=""
 #
 JENKINS_HTTPS_PORT=""
 
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# Path to the keystore in JKS format (as created by the JDK 'keytool').
+# Default is disabled.
+#
+JENKINS_HTTPS_KEYSTORE=""
+
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# Password to access the keystore defined in JENKINS_HTTPS_KEYSTORE.
+# Default is disabled.
+#
+JENKINS_HTTPS_KEYSTORE_PASSWORD=""
+
 ## Type:        string
 ## Default:     ""
 ## ServiceRestart: jenkins