Add start delay to monit for jnlp daemon

[releng.git] / utils / jenkins-jnlp-connect.sh

diff --git a/utils/jenkins-jnlp-connect.sh b/utils/jenkins-jnlp-connect.sh
index 8fce2e0..c8a2b49 100755 (executable)
--- a/utils/jenkins-jnlp-connect.sh
+++ b/utils/jenkins-jnlp-connect.sh
@@ -52,7 +52,7 @@ main () {
     fi
 
     if [[ $(whoami) != "root" ]]; then
     fi
 
     if [[ $(whoami) != "root" ]]; then

-      if sudo -l | grep "requiretty"; then
+      if sudo -l | grep "requiretty"  | grep -v "\!requiretty"; then

         echo "please comment out Defaults requiretty from /etc/sudoers"
         exit 1
       fi
         echo "please comment out Defaults requiretty from /etc/sudoers"
         exit 1
       fi


@@ -61,8 +61,8 @@ main () {
     #make pid dir
     pidfile="/var/run/$jenkinsuser/jenkins_jnlp_pid"
     if ! [ -d /var/run/$jenkinsuser/ ]; then
     #make pid dir
     pidfile="/var/run/$jenkinsuser/jenkins_jnlp_pid"
     if ! [ -d /var/run/$jenkinsuser/ ]; then

-        mkdir /var/run/$jenkinsuser/
-        chown $jenkinsuser:$jenkinsuser /var/run/$jenkinsuser/
+        sudo mkdir /var/run/$jenkinsuser/
+        sudo chown $jenkinsuser:$jenkinsuser /var/run/$jenkinsuser/

     fi
 
     if [[ $skip_monit != true ]]; then
     fi
 
     if [[ $skip_monit != true ]]; then


@@ -84,8 +84,14 @@ main () {
 
         if [ -d /etc/monit/conf.d ]; then
             monitconfdir="/etc/monit/conf.d/"
 
         if [ -d /etc/monit/conf.d ]; then
             monitconfdir="/etc/monit/conf.d/"

+            monitconfig="/etc/monit/monitrc"
+            #add start delay
+            sed -i '/^#.* delay /s/^#//' "$monitconfig"

         elif [ -d /etc/monit.d ]; then
             monitconfdir="/etc/monit.d"
         elif [ -d /etc/monit.d ]; then
             monitconfdir="/etc/monit.d"

+            monitconfig="/etc/monitrc"
+            #add start delay
+            sed -i '/^#.* delay /s/^#//' "$monitconfig"

         else
             echo "Could not determine the location of the monit configuration file."
             echo "Make sure monit is installed."
         else
             echo "Could not determine the location of the monit configuration file."
             echo "Make sure monit is installed."