wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-08-13 16:23:00 +02:00
Code Issues Projects Releases Wiki Activity

facts definition fix

Browse source
This commit is contained in:
Jack Ivanov 2019-04-29 09:47:42 +02:00
parent faa4b9a8da
commit 92948ec45e
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
input.yml
View file

@ -146,8 +146,8 @@
{%- elif _windows.user_input %}{{ booleans_map[_windows.user_input] | default(defaults['windows']) }} {%- elif _windows.user_input %}{{ booleans_map[_windows.user_input] | default(defaults['windows']) }}
{%- else %}false{% endif %} {%- else %}false{% endif %}
algo_store_cakey: >- algo_store_cakey: >-
{% if store_cakey is defined %}{{ store_cakey | bool }} {% if ipsec_enabled %}{%- if store_cakey is defined %}{{ store_cakey | bool }}
{%- elif _store_cakey.user_input %}{{ booleans_map[_store_cakey.user_input] | default(defaults['store_cakey']) }} {%- elif _store_cakey.user_input %}{{ booleans_map[_store_cakey.user_input] | default(defaults['store_cakey']) }}
{%- else %}false{% endif %} {%- else %}false{% endif %}{% endif %}
rescue: rescue:
- include_tasks: playbooks/rescue.yml - include_tasks: playbooks/rescue.yml

7
roles/local/tasks/prompts.yml
View file

@ -13,14 +13,12 @@
{%- elif _algo_server.user_input %}{{ _algo_server.user_input }} {%- elif _algo_server.user_input %}{{ _algo_server.user_input }}
{%- else %}localhost{% endif %} {%- else %}localhost{% endif %}
- block:
- pause: - pause:
prompt: | prompt: |
What user should we use to login on the server? (note: passwordless login required, or ignore if you're deploying to localhost) What user should we use to login on the server? (note: passwordless login required, or ignore if you're deploying to localhost)
[root] [root]
register: _algo_ssh_user register: _algo_ssh_user
when:
- ssh_user is undefined
- cloud_instance_ip != "localhost"
- name: Set the facts - name: Set the facts
set_fact: set_fact:
@ -28,6 +26,9 @@
{% if ssh_user is defined %}{{ ssh_user }} {% if ssh_user is defined %}{{ ssh_user }}
{%- elif _algo_ssh_user.user_input %}{{ _algo_ssh_user.user_input }} {%- elif _algo_ssh_user.user_input %}{{ _algo_ssh_user.user_input }}
{%- else %}root{% endif %} {%- else %}root{% endif %}
when:
- ssh_user is undefined
- cloud_instance_ip != "localhost"
- pause: - pause:
prompt: | prompt: |