mirror of
https://github.com/trailofbits/algo.git
synced 2025-04-20 08:07:09 +02:00
273c7665d3
<!--- Provide a general summary of your changes in the Title above --> ## Description Renames the vpn role to strongswan, and split up the variables to support 2 separate VPNs. Closes #1330 and closes #1162 Configures Ansible to use python3 on the server side. Closes #1024 Removes unneeded playbooks, reorganises a lot of variables Reorganises the `config` folder. Closes #1330 <details><summary>Here is how the config directory looks like now</summary> <p> ``` configs/X.X.X.X/ |-- ipsec | |-- apple | | |-- desktop.mobileconfig | | |-- laptop.mobileconfig | | `-- phone.mobileconfig | |-- manual | | |-- cacert.pem | | |-- desktop.p12 | | |-- desktop.ssh.pem | | |-- ipsec_desktop.conf | | |-- ipsec_desktop.secrets | | |-- ipsec_laptop.conf | | |-- ipsec_laptop.secrets | | |-- ipsec_phone.conf | | |-- ipsec_phone.secrets | | |-- laptop.p12 | | |-- laptop.ssh.pem | | |-- phone.p12 | | `-- phone.ssh.pem | `-- windows | |-- desktop.ps1 | |-- laptop.ps1 | `-- phone.ps1 |-- ssh-tunnel | |-- desktop.pem | |-- desktop.pub | |-- laptop.pem | |-- laptop.pub | |-- phone.pem | |-- phone.pub | `-- ssh_config `-- wireguard |-- desktop.conf |-- desktop.png |-- laptop.conf |-- laptop.png |-- phone.conf `-- phone.png ```  </p> </details> ## Motivation and Context This refactoring is focused to aim to the 1.0 release ## How Has This Been Tested? Deployed to several cloud providers with various options enabled and disabled ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Refactoring ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [x] I have read the **CONTRIBUTING** document. - [x] My code follows the code style of this project. - [x] My change requires a change to the documentation. - [x] I have updated the documentation accordingly. - [x] All new and existing tests passed.
45 lines
1.6 KiB
YAML
45 lines
1.6 KiB
YAML
---
|
|
- name: Set subjectAltName as afact
|
|
set_fact:
|
|
IP_subject_alt_name: "{{ (IP_subject_alt_name if algo_provider == 'local' else cloud_instance_ip) | lower }}"
|
|
|
|
- name: Add the server to an inventory group
|
|
add_host:
|
|
name: "{% if cloud_instance_ip == 'localhost' %}localhost{% else %}{{ cloud_instance_ip }}{% endif %}"
|
|
groups: vpn-host
|
|
ansible_connection: "{% if cloud_instance_ip == 'localhost' %}local{% else %}ssh{% endif %}"
|
|
ansible_ssh_user: "{{ ansible_ssh_user }}"
|
|
ansible_python_interpreter: "/usr/bin/python3"
|
|
algo_provider: "{{ algo_provider }}"
|
|
algo_server_name: "{{ algo_server_name }}"
|
|
algo_ondemand_cellular: "{{ algo_ondemand_cellular }}"
|
|
algo_ondemand_wifi: "{{ algo_ondemand_wifi }}"
|
|
algo_ondemand_wifi_exclude: "{{ algo_ondemand_wifi_exclude }}"
|
|
algo_local_dns: "{{ algo_local_dns }}"
|
|
algo_ssh_tunneling: "{{ algo_ssh_tunneling }}"
|
|
algo_windows: "{{ algo_windows }}"
|
|
algo_store_cakey: "{{ algo_store_cakey }}"
|
|
IP_subject_alt_name: "{{ IP_subject_alt_name }}"
|
|
|
|
- name: Additional variables for the server
|
|
add_host:
|
|
name: "{% if cloud_instance_ip == 'localhost' %}localhost{% else %}{{ cloud_instance_ip }}{% endif %}"
|
|
ansible_ssh_private_key_file: "{{ SSH_keys.private }}"
|
|
when: algo_provider != 'local'
|
|
|
|
- name: Wait until SSH becomes ready...
|
|
wait_for:
|
|
port: 22
|
|
host: "{{ cloud_instance_ip }}"
|
|
search_regex: "OpenSSH"
|
|
delay: 10
|
|
timeout: 320
|
|
state: present
|
|
when: cloud_instance_ip != "localhost"
|
|
|
|
- debug:
|
|
var: IP_subject_alt_name
|
|
|
|
- name: A short pause, in order to be sure the instance is ready
|
|
pause:
|
|
seconds: 20
|