rewrite congrats

This commit is contained in:
Jack Ivanov 2017-02-14 20:25:56 +03:00
parent 36862d3abe
commit dd202bfd00
2 changed files with 24 additions and 21 deletions

View file

@ -67,23 +67,20 @@ CA_PayloadIdentifier: "{{ 700000 | random | to_uuid | upper }}"
BetweenClients_DROP: Y BetweenClients_DROP: Y
congrats: | congrats:
"#----------------------------------------------------------------------#" common: |
"# Congratulations! #" "# Congratulations! #"
"# Your Algo server is running. #" "# Your Algo server is running. #"
"# Config files and certificates are in the ./configs/ directory. #" "# Config files and certificates are in the ./configs/ directory. #"
"# Go to https://whoer.net/ after connecting #" "# Go to https://whoer.net/ after connecting #"
"# and ensure that all your traffic passes through the VPN. #" "# and ensure that all your traffic passes through the VPN. #"
"# Local DNS resolver and Proxy IP address: {{ local_service_ip }} #" "# Local DNS resolver and Proxy IP address: {{ local_service_ip }} #"
"# The p12 and SSH keys password is {{ easyrsa_p12_export_password }} #" p12_pass: |
"# The CA key password is {{ easyrsa_CA_password }} #" "# The p12 and SSH keys password is {{ easyrsa_p12_export_password }} #"
"#----------------------------------------------------------------------#" ca_key_pass: |
"# The CA key password is {{ easyrsa_CA_password }} #"
additional_information: | ssh_access: |
"#----------------------------------------------------------------------#" "# Shell access: ssh -i {{ ansible_ssh_private_key_file|default(omit) }} {{ ansible_ssh_user|default(omit) }}@{{ ansible_ssh_host|default(omit) }} #"
"# Shell access: ssh -i {{ ansible_ssh_private_key_file }} {{ ansible_ssh_user }}@{{ ansible_ssh_host }} #"
"#----------------------------------------------------------------------#"
SSH_keys: SSH_keys:
comment: algo@ssh comment: algo@ssh

View file

@ -49,6 +49,10 @@
include: playbooks/common.yml include: playbooks/common.yml
tags: [ 'digitalocean', 'ec2', 'gce', 'azure', 'local', 'pre' ] tags: [ 'digitalocean', 'ec2', 'gce', 'azure', 'local', 'pre' ]
- set_fact:
cloud_deployment: true
tags: ['cloud']
roles: roles:
- { role: security, tags: [ 'security' ] } - { role: security, tags: [ 'security' ] }
- { role: proxy, tags: [ 'proxy', 'adblock' ] } - { role: proxy, tags: [ 'proxy', 'adblock' ] }
@ -58,12 +62,14 @@
- { role: vpn, tags: [ 'vpn' ] } - { role: vpn, tags: [ 'vpn' ] }
post_tasks: post_tasks:
- debug: msg="{{ congrats.split('\n') }}" - debug:
msg:
- "{{ congrats.common.split('\n') }}"
- " {{ congrats.p12_pass }}"
- " {% if Store_CAKEY is defined and Store_CAKEY == 'N' %}{% else %}{{ congrats.ca_key_pass }}{% endif %}"
- " {% if cloud_deployment is defined %}{{ congrats.ssh_access }}{% endif %}"
tags: always tags: always
- debug: msg="{{ additional_information.split('\n') }}"
tags: cloud
- name: Save the CA key password - name: Save the CA key password
local_action: > local_action: >
shell echo "{{ easyrsa_CA_password }}" > /tmp/ca_password shell echo "{{ easyrsa_CA_password }}" > /tmp/ca_password