diff --git a/tomcat/bin/catalina.sh b/tomcat/bin/catalina.sh index a8ba921..4a4d067 100755 --- a/tomcat/bin/catalina.sh +++ b/tomcat/bin/catalina.sh @@ -387,7 +387,7 @@ if [ "$1" = "debug" ] ; then -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ - -Dintermax.agentname=core_business1_tomcat -Dintermax.agentservice=ALL_SERVICE -Dintermax.agentgroup=core_business1_group -Dintermax.hostgroup=apck2 -Dintermax.tier=CORE \ + -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ org.apache.catalina.startup.Bootstrap "$@" start else @@ -398,7 +398,7 @@ if [ "$1" = "debug" ] ; then -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ - -Dintermax.agentname=core_business1_tomcat -Dintermax.agentservice=ALL_SERVICE -Dintermax.agentgroup=core_business1_group -Dintermax.hostgroup=apck2 -Dintermax.tier=CORE \ + -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ org.apache.catalina.startup.Bootstrap "$@" start fi @@ -420,7 +420,7 @@ elif [ "$1" = "run" ]; then -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - -Dintermax.agentname=core_business1_tomcat -Dintermax.agentservice=ALL_SERVICE -Dintermax.agentgroup=core_business1_group -Dintermax.hostgroup=apck2 -Dintermax.tier=CORE \ + -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ org.apache.catalina.startup.Bootstrap "$@" start else @@ -430,7 +430,7 @@ elif [ "$1" = "run" ]; then -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - -Dintermax.agentname=core_business1_tomcat -Dintermax.agentservice=ALL_SERVICE -Dintermax.agentgroup=core_business1_group -Dintermax.hostgroup=apck2 -Dintermax.tier=CORE \ + -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ org.apache.catalina.startup.Bootstrap "$@" start fi @@ -505,7 +505,7 @@ elif [ "$1" = "start" ] ; then -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - -Dintermax.agentname=core_business1_tomcat -Dintermax.agentservice=ALL_SERVICE -Dintermax.agentgroup=core_business1_group -Dintermax.hostgroup=apck2 -Dintermax.tier=CORE \ + -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ org.apache.catalina.startup.Bootstrap "$@" start \ >> "$CATALINA_OUT" 2>&1 "&" @@ -517,7 +517,7 @@ elif [ "$1" = "start" ] ; then -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - -Dintermax.agentname=core_business1_tomcat -Dintermax.agentservice=ALL_SERVICE -Dintermax.agentgroup=core_business1_group -Dintermax.hostgroup=apck2 -Dintermax.tier=CORE \ + -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ org.apache.catalina.startup.Bootstrap "$@" start \ >> "$CATALINA_OUT" 2>&1 "&" diff --git a/var.yml b/var.yml index 754832b..4dea403 100644 --- a/var.yml +++ b/var.yml @@ -2,4 +2,4 @@ variables: reg: "harbor.elppa.xyz" reg_id: "sa_8001" reg_pw: "Ios2011a!" - ver: "test18" \ No newline at end of file + ver: "test19" \ No newline at end of file