mirror of
https://github.com/trailofbits/algo.git
synced 2025-07-13 09:13:01 +02:00
Merge branch 'master' into patch-1
This commit is contained in:
commit
da56e1d95a
2 changed files with 7 additions and 9 deletions
|
@ -206,7 +206,7 @@ cloud_providers:
|
|||
image: Ubuntu 22.04 Jammy Jellyfish
|
||||
arch: x86_64
|
||||
hetzner:
|
||||
server_type: cx11
|
||||
server_type: cx22
|
||||
image: ubuntu-22.04
|
||||
openstack:
|
||||
flavor_ram: ">=512"
|
||||
|
|
14
users.yml
14
users.yml
|
@ -25,19 +25,17 @@
|
|||
set_fact:
|
||||
server_list: >-
|
||||
[{% for i in _configs_list.files %}
|
||||
{% set config = lookup('file', i.path)|from_yaml %}
|
||||
'{{ config.server }}'
|
||||
'{{ config.IP_subject_alt_name }}'
|
||||
{{ ',' if not loop.last else '' }}
|
||||
{% set config = lookup('file', i.path) | from_yaml %}
|
||||
{{ {'server': config.server, 'IP_subject_alt_name': config.IP_subject_alt_name} }}
|
||||
{% endfor %}]
|
||||
|
||||
- name: Server address prompt
|
||||
pause:
|
||||
prompt: |
|
||||
Select the server to update user list below:
|
||||
Select the server to update user list below:
|
||||
{% for r in server_list %}
|
||||
{{ loop.index }}. {{ r }}
|
||||
{% endfor %}
|
||||
{{ loop.index }}. {{ r.server }} ({{ r.IP_subject_alt_name }})
|
||||
{% endfor %}
|
||||
register: _server
|
||||
when: server is undefined
|
||||
|
||||
|
@ -46,7 +44,7 @@
|
|||
set_fact:
|
||||
algo_server: >-
|
||||
{% if server is defined %}{{ server }}
|
||||
{%- elif _server.user_input %}{{ server_list[_server.user_input | int -1 ] }}
|
||||
{%- elif _server.user_input %}{{ server_list[_server.user_input | int -1 ].server }}
|
||||
{%- else %}omit{% endif %}
|
||||
|
||||
- name: Import host specific variables
|
||||
|
|
Loading…
Add table
Reference in a new issue