nightly master updates

sakaiproject · Dec 10, 2024 · 3ff0ba7 · 3ff0ba7
1 parent 89f412d
commit 3ff0ba7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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"