blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-13 08:23:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

ITPLAT-518 adopt suggestions in PR comments

Browse Source
This commit is contained in:
Brett Meehan
2021-03-03 15:35:20 +11:00
parent ce7b3b3e43
commit 62ae18d90b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
aws_bitbucket_dc_node.yml
View File

@@ -22,7 +22,6 @@
- "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}" - "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}"
- "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}" - "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}"
atl_startup_exec_options: atl_startup_exec_options:
- "-fg"
- "--no-search" - "--no-search"
roles: roles:
@@ -37,5 +36,5 @@
- role: product_startup - role: product_startup
- role: bitbucket_dataset_restore - role: bitbucket_dataset_restore
when: atl_bitbucket_dataset_url is search ("(http|https)://") when: atl_bitbucket_dataset_url is search ("(http|https)://")

2
roles/product_startup/templates/product.service.j2
View File

@@ -18,7 +18,7 @@ StandardError=journal+console
{# Bitbucket DC sets up its service start/stop logging in a different way to all our other DC offerings and so we exclude it from having the catalina.out redirect and foreground startup #} {# Bitbucket DC sets up its service start/stop logging in a different way to all our other DC offerings and so we exclude it from having the catalina.out redirect and foreground startup #}
{% if (atl_product_family == "stash") %} {% if (atl_product_family == "stash") %}
PIDFile={{ atl_product_home }}/log/bitbucket.pid PIDFile={{ atl_product_home }}/log/bitbucket.pid
ExecStart={{ atl_startup_exec_path }} --no-search ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %}
ExecStop={{ atl_startup_exec_path }} ExecStop={{ atl_startup_exec_path }}
{% else -%} {% else -%}
ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %} >{{ atl_product_installation_current }}/logs/catalina.out 2>&1 ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %} >{{ atl_product_installation_current }}/logs/catalina.out 2>&1