Merge branch 'master' of github.com:monash-merc/ansible_cluster_in_a_box
Conflicts: roles/OpenVPN-Client/vars/main.yml roles/OpenVPN-Server/vars/main.yml roles/easy-rsa-CA-client/vars/main.yml roles/easy-rsa-CA-server/vars/main.yml roles/easy-rsa-CA/vars/main.yml
No related branches found
No related tags found
Showing
- roles/OpenVPN-Client/vars/main.yml 0 additions, 0 deletionsroles/OpenVPN-Client/vars/main.yml
- roles/OpenVPN-Server/vars/main.yml 0 additions, 0 deletionsroles/OpenVPN-Server/vars/main.yml
- roles/easy-rsa-CA-client/vars/main.yml 0 additions, 2 deletionsroles/easy-rsa-CA-client/vars/main.yml
- roles/easy-rsa-CA-server/vars/main.yml 0 additions, 2 deletionsroles/easy-rsa-CA-server/vars/main.yml
- roles/easy-rsa-CA/vars/main.yml 0 additions, 2 deletionsroles/easy-rsa-CA/vars/main.yml
- vars/CentOS.yml 3 additions, 0 deletionsvars/CentOS.yml
- vars/Debian.yml 3 additions, 0 deletionsvars/Debian.yml
- vars/defaults.yml 3 additions, 0 deletionsvars/defaults.yml
roles/OpenVPN-Client/vars/main.yml
deleted
100644 → 0
roles/OpenVPN-Server/vars/main.yml
deleted
100644 → 0
roles/easy-rsa-CA/vars/main.yml
deleted
100644 → 0
vars/CentOS.yml
0 → 100644
vars/Debian.yml
0 → 100644
vars/defaults.yml
0 → 100644
Please register or sign in to comment