Variablize /usr/local/src. Add quotes for facts with variables. Change how Mullvad is installed on Devuan.
This commit is contained in:
@@ -43,7 +43,7 @@
|
||||
|
||||
- name: Workstation | Software | VPN | Mullvad | Devuan | Facts 01
|
||||
set_fact:
|
||||
devuan_mullvad_dir: ~/Downloads/mullvad-installer
|
||||
devuan_mullvad_dir: "{{ global_src }}/mullvad-installer"
|
||||
mullvad_deb_url: https://mullvad.net/en/download/app/deb/latest
|
||||
mullvad_repack_url: https://github.com/sys-fs/mullvad-repack
|
||||
|
||||
@@ -53,18 +53,18 @@
|
||||
|
||||
- name: Workstation | Software | VPN | Mullvad | Devuan | Check
|
||||
stat:
|
||||
path: "/opt/Mullvad VPN"
|
||||
path: '/opt/Mullvad VPN'
|
||||
register: mullvad_installed
|
||||
|
||||
- name: Workstation | Software | VPN | Mullvad | Devuan | Install
|
||||
shell: "{{ item }}"
|
||||
loop:
|
||||
- "mkdir -pv {{ devuan_mullvad_dir }}"
|
||||
- "cd {{ devuan_mullvad_dir }} && curl -L -o Mullvad.deb {{ mullvad_deb_url }}"
|
||||
- "cd {{ devuan_mullvad_dir }} && git clone {{ mullbvad_repack_url }}"
|
||||
- "curl -L -o {{ devuan_mullvad_dir }}/Mullvad.deb {{ mullvad_deb_url }}"
|
||||
- "rm -rfv {{ mullvad_repack_dir }}"
|
||||
- "git clone {{ mullvad_repack_url }} {{ mullvad_repack_dir }}"
|
||||
- "cd {{ mullvad_repack_dir }} && ./repack.sh ../Mullvad.deb"
|
||||
- "cd {{ devuan_mullvad_dir }} && apt install -y ./Mullvad_repack.deb"
|
||||
- "mv {{ devuan_mullvad_dir }} ~/TRASH/mullvad-completed-`date +'%Y%m%d-%H%M'`"
|
||||
- "apt-get install -y --reinstall {{ devuan_mullvad_dir }}/Mullvad_repack.deb"
|
||||
when: not mullvad_installed.stat.exists
|
||||
|
||||
when: ansible_pkg_mgr == "apt"
|
||||
@@ -84,6 +84,7 @@
|
||||
- name: Workstation | Software | VPN | Mullvad | PATH | Install
|
||||
shell: "{{ item }}"
|
||||
loop:
|
||||
- rm {{ mullvad_exe_new }}
|
||||
- echo "#!/usr/bin/env sh" > {{ mullvad_exe_new }}
|
||||
- echo "cd {{ mullvad_exe_dir }}" >> {{ mullvad_exe_new }}
|
||||
- echo "./{{ mullvad_exe }}" >> {{ mullvad_exe_new }}
|
||||
|
||||
Reference in New Issue
Block a user