From d6614ac52b3af6b8bca8c8c23438a020076faa33 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 23 Nov 2018 16:47:45 +0000
Subject: [PATCH] Fixes for Rundeck 3.0 release

---
 run.sh |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/run.sh b/run.sh
index 5c2ed07..52e0f8c 100755
--- a/run.sh
+++ b/run.sh
@@ -4,6 +4,15 @@
 	cp -Rfp /etc/rundeck-org/* /etc/rundeck/
 fi
 
+# Rundeck 3.0 - new property
+if ! grep -q -e "^rundeck.log4j.config.file" /etc/rundeck/rundeck-config.properties; then
+	echo "rundeck.log4j.config.file = /etc/rundeck/log4j.properties" \
+		>> /etc/rundeck/rundeck-config.properties
+fi
+
+# Rundeck 2.7, 3.0 - new profile
+cp -fp /etc/rundeck-org/profile /etc/rundeck/profile
+
 chown -Rf rundeck:rundeck /etc/rundeck /var/rundeck /var/lib/rundeck
 chmod -Rf o-rwx /etc/rundeck /var/rundeck /var/lib/rundeck
 
@@ -11,12 +20,5 @@
 chmod g+s,o+x /var/lib/rundeck/logs
 
 . /etc/rundeck/profile
-
-# Rundeck 2.6 to 2.7 migration - new profile file
-if [ -z "$rundeckd" ]; then
-	mv -f /etc/rundeck/profile /etc/rundeck/profile.pre-migration
-	cp -f /etc/rundeck-org/profile /etc/rundeck/profile
-	. /etc/rundeck/profile
-fi
 
 su rundeck -s /bin/bash -c "$rundeckd"

--
Gitblit v1.9.1