From 22e45a74065bbc2cfaa790890ff09ad59ef374cf Mon Sep 17 00:00:00 2001
From: Giorgio Peron <giorgio.peron@gmail.com>
Date: Sat, 28 Jul 2012 23:02:12 -0500
Subject: system/jenkins: Updated for version 1.474.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/jenkins/files/jenkinsd.sh       | 4 ++--
 system/jenkins/files/logrotate.jenkins | 3 ++-
 system/jenkins/files/rc.jenkins        | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'system/jenkins/files')

diff --git a/system/jenkins/files/jenkinsd.sh b/system/jenkins/files/jenkinsd.sh
index f10ed4f9abaf..87d6aa432a54 100644
--- a/system/jenkins/files/jenkinsd.sh
+++ b/system/jenkins/files/jenkinsd.sh
@@ -29,7 +29,7 @@ JENKINS_LOG_FILE="/var/log/jenkins/jenkins.log"
 JENKINS_CONSOLELOG_FILE="/var/log/jenkins/jenkins_console.log"
 JENKINS_PID_DIR="/var/run/jenkins/"
 JENKINS_PID_FILE="$JENKINS_PID_DIR/jenkins.pid"
-JENKINS_WEBAPPSDIR="/var/lib/jenkins/apps/"
+#JENKINS_WEBAPPSDIR="/var/lib/jenkins/apps/"
 JENKINS_WEBROOT="/var/lib/jenkins/webroot/"
 JENKINS_HOME="/var/lib/jenkins"
 OPT_ARGS=""
@@ -84,7 +84,7 @@ if [ "$JENKINS_LOG_FILE" != "" ] ; then
 fi
 
 if [ "$JENKINS_WEBAPPSDIR" != "" ] ; then
-  JENKINS_WEBAPPSDIR_ARG="--webapssDir=$JENKINS_WEBAPPSDIR"
+  JENKINS_WEBAPPSDIR_ARG="--webappsDir=$JENKINS_WEBAPPSDIR"
 fi
 
 if [ "$JENKINS_WEBROOT" != "" ] ; then
diff --git a/system/jenkins/files/logrotate.jenkins b/system/jenkins/files/logrotate.jenkins
index f6b40db07baf..f1bc7f0f11e3 100644
--- a/system/jenkins/files/logrotate.jenkins
+++ b/system/jenkins/files/logrotate.jenkins
@@ -1,4 +1,5 @@
 /var/log/jenkins/jenkins.log /var/log/jenkins/jenkins_console.log {
+    su jenkins jenkins
     compress
     dateext
     maxage 365
@@ -8,6 +9,6 @@
     missingok
     create 644
     postrotate
-     kill -s SIGALRM `cat /var/run/jenkins.pid`
+     kill -s SIGALRM $(cat /var/run/jenkins.pid)
     endscript
 }
diff --git a/system/jenkins/files/rc.jenkins b/system/jenkins/files/rc.jenkins
index d13e3912aa20..3d83b42444af 100644
--- a/system/jenkins/files/rc.jenkins
+++ b/system/jenkins/files/rc.jenkins
@@ -36,6 +36,7 @@ jenkins_start() {
     exit 1
   else
     echo "Starting jenkins daemon..."
+    install -o jenkins:jenkins -m 0755 -d /var/run/jenkins
     jenkinsd 2>/dev/null 1>&2 || exit 1
   fi
 }
-- 
cgit v1.2.3