From 3ff0ba7cef3f1a69584260fbd0ac47aae5fd8f5d Mon Sep 17 00:00:00 2001
From: Earle Nietzel <earle@longsight.com>
Date: Tue, 10 Dec 2024 17:31:41 -0500
Subject: [PATCH] nightly master updates

---
 restarts/maria-trunk.sh | 3 +++
 setenv.sh               | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/restarts/maria-trunk.sh b/restarts/maria-trunk.sh
index 43b8adf..e4ece4c 100644
--- a/restarts/maria-trunk.sh
+++ b/restarts/maria-trunk.sh
@@ -6,6 +6,9 @@
 BUILD_ID="bin/start.sh"
 
 CATALINA_BASE=/var/trunk-maria
+cp catalina.properties  ${CATALINA_BASE}/conf/catalina.properties
+cp context.xml ${CATALINA_BASE}/conf/context.xml
+cp setenv.sh  ${CATALINA_BASE}/bin/setenv.sh
 cp master.properties ${CATALINA_BASE}/sakai/sakai.properties
 cd ${CATALINA_BASE}
 source bin/common.sh
diff --git a/setenv.sh b/setenv.sh
index fc8391b..f1408a6 100644
--- a/setenv.sh
+++ b/setenv.sh
@@ -67,7 +67,7 @@ CATALINA_OPTS="$CATALINA_OPTS -Duser.timezone=US/Eastern"
 CATALINA_OPTS="$CATALINA_OPTS -Dsakai.cookieName=SAKAIID"
 
 # JMX config
-#CATALINA_OPTS="$CATALINA_OPTS -Djava.rmi.server.hostname=xxx.xxx.xxx.xxx \
+#CATALINA_OPTS="$CATALINA_OPTS -Djava.rmi.server.hostname=172.31.6.159 \
 #	                          -Dcom.sun.management.jmxremote.port=xxxxx \
 #	                          -Dcom.sun.management.jmxremote.ssl=false \
 #	                          -Dcom.sun.management.jmxremote.authenticate=false"