From 115f27ad32ea3685a007b6ad15aada4df6b2c0b8 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 7 Jun 2011 10:18:40 -0700 Subject: [PATCH] reapplying 29c2512feecca27b9a6c22eaf59681339e96018f to OpenSUSE as well --- opensuse/SOURCES/jenkins.init.in | 1 + opensuse/SOURCES/jenkins.sysconfig.in | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/opensuse/SOURCES/jenkins.init.in b/opensuse/SOURCES/jenkins.init.in index 575a063c16..593171fc53 100644 --- a/opensuse/SOURCES/jenkins.init.in +++ b/opensuse/SOURCES/jenkins.init.in @@ -79,6 +79,7 @@ export JAVA_HOME JAVA_CMD="$JAVA_HOME/bin/java $JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR" PARAMS="--javaHome=$JAVA_HOME --logfile=/var/log/jenkins/jenkins.log" [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT" +[ -n "$JENKINS_AJP_PORT" ] && PARAMS="$PARAMS --ajp13Port=$JENKINS_AJP_PORT" [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL" [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP" [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX" diff --git a/opensuse/SOURCES/jenkins.sysconfig.in b/opensuse/SOURCES/jenkins.sysconfig.in index c480861e9a..edc6a0d796 100644 --- a/opensuse/SOURCES/jenkins.sysconfig.in +++ b/opensuse/SOURCES/jenkins.sysconfig.in @@ -63,9 +63,19 @@ JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true" ## ServiceRestart: jenkins # # Port Jenkins is listening on. +# Set to -1 to disable # JENKINS_PORT="8080" +## Type: integer(0:65535) +## Default: 8009 +## ServiceRestart: jenkins +# +# Ajp13 Port Jenkins is listening on. +# Set to -1 to disable +# +JENKINS_AJP_PORT="8009" + ## Type: integer(1:9) ## Default: 5 ## ServiceRestart: jenkins -- GitLab