7 files changed, 23 insertions, 54 deletions
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.confd b/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
index f84e3463e359..208dd2850408 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin.confd
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
@@ -28,16 +28,6 @@ JENKINS_DEBUG_LEVEL="5"
 JENKINS_ENABLE_ACCESS_LOG="no"
 
 #
-# Maximum number of HTTP worker threads.
-#
-JENKINS_HANDLER_MAX="100"
-
-#
-# Maximum number of idle HTTP worker threads.
-#
-JENKINS_HANDLER_IDLE="20"
-
-#
 # Pass arbitrary arguments to Jenkins.
 # Eg.: --httpListenAddress=127.0.0.1 --prefix=/jenkins
 # Full option list: java -jar jenkins.war --help
@@ -49,10 +39,8 @@ JENKINS_ARGS=""
 #
 JENKINS_USER=jenkins
 
-
-
 #
-# Pid File 
+# Pid File
 #
 JENKINS_PIDFILE="/var/run/jenkins.pid"
 
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate b/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
deleted file mode 100644
index 33b16600452e..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
+++ /dev/null
@@ -1,17 +0,0 @@
-/var/log/jenkins/jenkins.log /var/log/jenkins/access_log {
-    compress
-    dateext
-    maxage 365
-    rotate 99
-    size=+4096k
-    notifempty
-    missingok
-    create 644
-    postrotate
-        [ -r /etc/conf.d/jenkins ] && . /etc/conf.d/jenkins
-        if [ -s /var/run/jenkins.pid ]; then
-            JPID=$(cat /var/run/jenkins.pid)
-            test -n "$(find /proc/$JPID -maxdepth 0 -user ${RUN_AS:-jenkins} 2>/dev/null)" && kill -s ALRM $JPID || :
-        fi
-    endscript
-}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.init2 b/dev-util/jenkins-bin/files/jenkins-bin-r3.init
index 93d4d5f7e687..b5c02a0ea2b5 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin.init2
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r3.init
@@ -28,9 +28,6 @@ start() {
     PARAMS="--logfile=/var/log/jenkins/jenkins.log"
     [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_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"
-    [ -n "$JENKINS_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$JENKINS_HANDLER_IDLE"
     [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
 
     if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.logrotate b/dev-util/jenkins-bin/files/jenkins-bin-r3.logrotate
new file mode 100644
index 000000000000..4839e682c69e
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r3.logrotate
@@ -0,0 +1,11 @@
+/var/log/jenkins/jenkins.log /var/log/jenkins/access_log {
+    compress
+    dateext
+    maxage 365
+    rotate 99
+    size 4M
+    notifempty
+    missingok
+    create 644
+    copytruncate
+}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r5.service b/dev-util/jenkins-bin/files/jenkins-bin-r5.service
new file mode 100644
index 000000000000..e92f1d0a19f7
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r5.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Jenkins Daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/jenkins
+Type=simple
+ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS}
+User=jenkins
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service b/dev-util/jenkins-bin/files/jenkins-bin.service
deleted file mode 100644
index 5edaac7da40a..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Jenkins Daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/java -Djava.awt.headless=true -DJENKINS_HOME=/var/lib/jenkins/home -jar /opt/jenkins/jenkins.war --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=8080 --debug=5 --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log
-User=jenkins
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service2 b/dev-util/jenkins-bin/files/jenkins-bin.service2
deleted file mode 100644
index f109fac02cc9..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.service2
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Jenkins Daemon
-
-[Service]
-EnvironmentFile=/etc/conf.d/jenkins
-Type=forking
-ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS}
-User=jenkins
-
-[Install]
-WantedBy=multi-user.target