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 modify unit file for bbdc to not start foreground

Browse Source
This commit is contained in:
Brett Meehan
2021-03-03 13:59:43 +11:00
parent 897dd60094
commit 561ca14058
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
roles/product_startup/defaults/main.yml
View File

@@ -10,9 +10,16 @@ atl_startup_script_map:
stash: "bin/start-bitbucket.sh" stash: "bin/start-bitbucket.sh"
crowd: "start_crowd.sh" crowd: "start_crowd.sh"
atl_stop_script_map:
jira: "bin/stop-jira.sh"
confluence: "bin/stop-confluence.sh"
stash: "bin/stop-bitbucket.sh"
crowd: "stop_crowd.sh"
atl_startup_exec_path: "{{ atl_product_installation_current }}/{{ atl_startup_script_map[atl_product_family] }}" atl_startup_exec_path: "{{ atl_product_installation_current }}/{{ atl_startup_script_map[atl_product_family] }}"
atl_startup_exec_options: ["-fg"] atl_startup_exec_options: ["-fg"]
atl_startup_systemd_params: [] atl_startup_systemd_params: []
atl_stop_exec_path: "{{ atl_product_installation_current }}/{{ atl_stop_script_map[atl_product_family] }}"
atl_systemd_service_dir_map: atl_systemd_service_dir_map:
amazon: "/usr/lib/systemd/system" amazon: "/usr/lib/systemd/system"

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

@@ -3,6 +3,9 @@ Description=Atlassian {{ atl_product_edition }}
After=network-online.target After=network-online.target
[Service] [Service]
{% if (atl_product_family == "stash") %}
Type=forking
{% endif %}
User={{ atl_product_user }} User={{ atl_product_user }}
Group={{ atl_product_user }} Group={{ atl_product_user }}
StandardOutput=journal+console StandardOutput=journal+console
@@ -12,8 +15,14 @@ StandardError=journal+console
{{ p }} {{ p }}
{% endfor %} {% endfor %}
{# 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 #} {# 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 #}
ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %}{% if (atl_product_family != "stash") %} >{{ atl_product_installation_current }}/logs/catalina.out 2>&1{% endif %} {% if (atl_product_family == "stash") %}
PIDFile={{ atl_product_home }}/log/bitbucket.pid
ExecStart={{ atl_startup_exec_path }} --no-search
ExecStop={{ atl_startup_exec_path }}
{% else -%}
ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %} >{{ atl_product_installation_current }}/logs/catalina.out 2>&1
{% endif %}
Restart=on-failure Restart=on-failure