Merge branch '9.0'

avniproject · Jun 27, 2024 · c8182c9 · c8182c9
2 parents 9c6bad7 + 8b3633c
commit c8182c9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/configure/group_vars/prerelease_vars.yml b/configure/group_vars/prerelease_vars.yml
@@ -39,7 +39,7 @@ scheduled_job_repeat_interval: "60"
 
 avni_server_host: "localhost"
 avni_server_port: "8021"
-avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/avni_server/ -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
+avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Dlogging.file.max-history=90 -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/avni_server/ -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
 avni_server_db_host: "prereleasedb.avniproject.org."
 avni_server_db_port: "5432"
 avni_server_db_schema: "public"
@@ -78,4 +78,4 @@ newrelic_distributed_tracing_enabled: "false"
 avni_reporting_system_0_name: "Metabase Reports"
 avni_reporting_system_0_url: "https://reporting.avniproject.org"
 avni_reporting_system_1_name: "Jasper Reports"
-avni_reporting_system_1_url: "https://reporting-jasper.avniproject.org/jasperserver/login.html"
+avni_reporting_system_1_url: "https://reporting-jasper.avniproject.org/jasperserver/login.html"
diff --git a/configure/group_vars/prod_vars.yml b/configure/group_vars/prod_vars.yml
@@ -40,7 +40,7 @@ scheduled_job_repeat_interval: "120"
 
 avni_server_host: "localhost"
 avni_server_port: "8021"
-avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xms2560m -Xmx2560m -XX:MaxMetaspaceSize=512m -XX:CompressedClassSpaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath={{avni_server_access_log_dir}}/ -XX:OnOutOfMemoryError=\"shutdown -r\" -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -XX:+UseStringDeduplication -XX:-OmitStackTraceInFastThrow -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=50M -Xloggc:{{avni_server_access_log_dir}}/gc.log"
+avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Dlogging.file.max-history=90 -Xms2560m -Xmx2560m -XX:MaxMetaspaceSize=512m -XX:CompressedClassSpaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath={{avni_server_access_log_dir}}/ -XX:OnOutOfMemoryError=\"shutdown -r\" -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -XX:+UseStringDeduplication -XX:-OmitStackTraceInFastThrow -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=50M -Xloggc:{{avni_server_access_log_dir}}/gc.log"
 avni_server_db_host: "serverdb.openchs.org."
 avni_server_db_port: "5432"
 avni_server_db_schema: "public"
@@ -79,4 +79,4 @@ newrelic_distributed_tracing_enabled: "false"
 avni_reporting_system_0_name: "Metabase Reports"
 avni_reporting_system_0_url: "https://reporting.avniproject.org"
 avni_reporting_system_1_name: "Jasper Reports"
-avni_reporting_system_1_url: "https://reporting-jasper.avniproject.org/jasperserver/login.html"
+avni_reporting_system_1_url: "https://reporting-jasper.avniproject.org/jasperserver/login.html"
diff --git a/configure/group_vars/rwb_prod_vars.yml b/configure/group_vars/rwb_prod_vars.yml
@@ -38,7 +38,7 @@ scheduled_job_trigger_misfire_threshold: "2700000"
 scheduled_job_repeat_interval: "60"
 avni_server_host: "localhost"
 avni_server_port: "8021"
-avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx1512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/avni_server/ -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
+avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Dlogging.file.max-history=90 -Xmx1512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/avni_server/ -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
 avni_server_db_host: "serverdb.rwb.avniproject.org."
 avni_server_db_port: "5432"
 avni_server_db_schema: "public"
@@ -78,4 +78,4 @@ newrelic_distributed_tracing_enabled: "false"
 avni_reporting_system_0_name: "Jasper Reports"
 avni_reporting_system_0_url: "https://jasper.rwb.avniproject.org/jasperserver/login.html"
 avni_reporting_system_1_name: ""
-avni_reporting_system_1_url: ""
+avni_reporting_system_1_url: ""
diff --git a/configure/group_vars/rwb_staging_vars.yml b/configure/group_vars/rwb_staging_vars.yml
@@ -38,7 +38,7 @@ scheduled_job_trigger_misfire_threshold: "2700000"
 scheduled_job_repeat_interval: "60"
 avni_server_host: "localhost"
 avni_server_port: "8021"
-avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx1512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/avni_server/ -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
+avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Dlogging.file.max-history=90 -Xmx1512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/avni_server/ -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
 avni_server_db_host: "stagingdb.rwb.avniproject.org."
 avni_server_db_port: "5432"
 avni_server_db_schema: "public"
@@ -79,4 +79,4 @@ newrelic_distributed_tracing_enabled: "false"
 avni_reporting_system_0_name: "Jasper Reports"
 avni_reporting_system_0_url: "https://jasper.rwb.avniproject.org/jasperserver/login.html"
 avni_reporting_system_1_name: ""
-avni_reporting_system_1_url: ""
+avni_reporting_system_1_url: ""