diff --git a/automation/roles/algo/tasks/main.yml b/automation/roles/algo/tasks/main.yml index 71e57b5e..56ba099e 100644 --- a/automation/roles/algo/tasks/main.yml +++ b/automation/roles/algo/tasks/main.yml @@ -49,16 +49,16 @@ dest: /etc/supervisor/conf.d/wg_monitor_connections.conf # Don't setup algo when in restore mode, bubble_restore_monitor.sh will set it up after the CA key has been restored -- name: Run algo playbook to install algo +- name: Run algo playbook to install algo for brand new nodes shell: /root/ansible/roles/algo/algo/install_algo.sh when: restore_key is not defined # Don't start monitors when in restore mode, bubble_restore_monitor.sh will start it after algo is installed -- name: Run algo playbook to install algo +- name: Restart algo_refresh_users_monitor and wg_monitor_connections for brand new nodes shell: bash -c "supervisorctl reload && sleep 5s && supervisorctl restart algo_refresh_users_monitor && supervisorctl restart wg_monitor_connections" when: restore_key is not defined -- name: Run algo playbook to install algo +- name: Stop algo monitors shell: bash -c "supervisorctl reload && sleep 5s && supervisorctl stop algo_refresh_users_monitor && supervisorctl stop wg_monitor_connections" when: restore_key is defined diff --git a/bubble-server/src/main/resources/bubble/node_progress_meter_ticks.json b/bubble-server/src/main/resources/bubble/node_progress_meter_ticks.json index a2677627..4cc7cced 100644 --- a/bubble-server/src/main/resources/bubble/node_progress_meter_ticks.json +++ b/bubble-server/src/main/resources/bubble/node_progress_meter_ticks.json @@ -13,7 +13,7 @@ { "percent": 44,"messageKey":"role_bubble_jar", "pattern":"TASK \\[bubble : Install bubble jar] \\*{5,}" }, { "percent": 48,"messageKey":"role_bubble_db", "pattern":"TASK \\[bubble : Populate database] \\*{5,}" }, { "percent": 51,"messageKey":"role_bubble_restore", "pattern":"TASK \\[bubble : Install restore helper scripts] \\*{5,}" }, -{ "percent": 52,"messageKey":"role_bubble_algo", "pattern":"TASK \\[algo : Run algo playbook to install algo] \\*{5,}" }, +{ "percent": 52,"messageKey":"role_bubble_algo", "pattern":"TASK \\[algo : Install wg_monitor_connections supervisor conf file] \\*{5,}" }, { "percent": 76,"messageKey":"role_nginx", "pattern":"TASK \\[nginx : [\\w\\s]+] \\*{5,}" }, { "percent": 81,"messageKey":"role_nginx_certbot", "pattern":"TASK \\[nginx : Init certbot] \\*{5,}" }, { "percent": 91,"messageKey":"role_mitmproxy", "pattern":"TASK \\[mitmproxy : [\\w\\s]+] \\*{5,}" },