Browse Source

Rename algo related ansible tag

pull/16/head
Kristijan Mitrovic 4 years ago
parent
commit
b4f1c4009f
5 changed files with 5 additions and 5 deletions
  1. +1
    -1
      automation/roles/algo/tasks/main.yml
  2. +1
    -1
      automation/roles/bubble/files/bubble_restore_monitor.sh
  3. +1
    -1
      automation/roles/mitmproxy/tasks/main.yml
  4. +1
    -1
      automation/roles/mitmproxy/tasks/route.yml
  5. +1
    -1
      bubble-server/src/main/resources/ansible/install_local.sh.hbs

+ 1
- 1
automation/roles/algo/tasks/main.yml View File

@@ -58,5 +58,5 @@


- include: algo_firewall.yml - include: algo_firewall.yml
# Don't setup algo when in restore mode, bubble_restore_monitor.sh will set it up after the CA key has been restored # Don't setup algo when in restore mode, bubble_restore_monitor.sh will set it up after the CA key has been restored
tags: post_restore
tags: algo_related



+ 1
- 1
automation/roles/bubble/files/bubble_restore_monitor.sh View File

@@ -126,7 +126,7 @@ else
cd "${ANSIBLE_DIR}" && \ cd "${ANSIBLE_DIR}" && \
. ./venv/bin/activate && \ . ./venv/bin/activate && \
bash -c \ bash -c \
"ansible-playbook ${SSH_OPTIONS} --tags 'post_restore,always' --inventory ./hosts ./playbook.yml 2>&1 >> ${LOG}" \
"ansible-playbook ${SSH_OPTIONS} --tags 'algo_related,always' --inventory ./hosts ./playbook.yml 2>&1 >> ${LOG}" \
|| die "Error running ansible in post-restore. journalctl -xe = $(journalctl -xe | tail -n 50)" || die "Error running ansible in post-restore. journalctl -xe = $(journalctl -xe | tail -n 50)"
fi fi




+ 1
- 1
automation/roles/mitmproxy/tasks/main.yml View File

@@ -91,7 +91,7 @@
service: service:
name: dnscrypt-proxy name: dnscrypt-proxy
state: restarted state: restarted
tags: post_restore
tags: algo_related


- name: restart supervisord - name: restart supervisord
service: service:


+ 1
- 1
automation/roles/mitmproxy/tasks/route.yml View File

@@ -58,4 +58,4 @@
- name: save iptables v6 rules - name: save iptables v6 rules
shell: ip6tables-save > /etc/iptables/rules.v6 shell: ip6tables-save > /etc/iptables/rules.v6
become: yes become: yes
tags: post_restore
tags: algo_related

+ 1
- 1
bubble-server/src/main/resources/ansible/install_local.sh.hbs View File

@@ -51,7 +51,7 @@ SSH_OPTIONS="--ssh-extra-args '-o UserKnownHostsFile=/dev/null -o StrictHostKeyC


SKIP_TAGS="" SKIP_TAGS=""
if [[ -n "{{restoreKey}}" ]] ; then if [[ -n "{{restoreKey}}" ]] ; then
SKIP_TAGS="--skip-tags post_restore"
SKIP_TAGS="--skip-tags algo_related"
fi fi


cd "${ANSIBLE_DIR}" && \ cd "${ANSIBLE_DIR}" && \


Loading…
Cancel
Save