From 84c49e96e2fe4670046558f0842c8ea7475f15d0 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 15 Mar 2018 13:26:14 +0000
Subject: [PATCH] Merge branch 'master' into ansible
---
run.sh | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/run.sh b/run.sh
index b864612..5c2ed07 100755
--- a/run.sh
+++ b/run.sh
@@ -12,9 +12,11 @@
. /etc/rundeck/profile
-DAEMON="java"
-DAEMON_ARGS="${RDECK_JVM} -cp ${BOOTSTRAP_CP} com.dtolabs.rundeck.RunServer /var/lib/rundeck 4440"
-
-rundeckd="$DAEMON $DAEMON_ARGS"
+# 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