From 9dd5bc19730c43eb8e6bf6b191094605e460c09a Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Wed, 17 Mar 2021 00:43:57 +0100
Subject: [PATCH] update openvpn

---
 roles/openvpn/tasks/main.yml         | 31 ++++++++++++++--------------
 roles/openvpn/tasks/versioncheck.yml | 31 ++++++++++++++--------------
 roles/openvpn/vars/main.yml          |  3 +++
 3 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 roles/openvpn/vars/main.yml

diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml
index 304dfc9..061b523 100644
--- a/roles/openvpn/tasks/main.yml
+++ b/roles/openvpn/tasks/main.yml
@@ -1,16 +1,18 @@
 ---
+- name: perform versionscheck
+  ansible.builtin.include_tasks: versioncheck.yml
 
 - name: Run the equivalent of "pacman -Syu" as a separate step
-  become: yes
-  pacman:
-    update_cache: yes
-    upgrade: yes
+  become: true
+  ansible.builtin.pacman:
+    update_cache: true
+    upgrade: true
   when: ansible_os_family == 'Archlinux'
 
 - name: Install OpenVPN for ArchLinux
-  become: yes
-  pacman:
-    name: 
+  become: true
+  ansible.builtin.pacman:
+    name:
       - openvpn
       - bridge-utils
       - easy-rsa
@@ -18,9 +20,9 @@
   when: ansible_os_family == 'Archlinux'
 
 - name: Install OpenVPN all
-  become: yes
-  package:
-    name: 
+  become: true
+  ansible.builtin.package:
+    name:
       - openvpn
       - bridge-utils
       - easy-rsa
@@ -28,14 +30,13 @@
   when: ansible_os_family != 'Archlinux'
 
 - name: Add the tun module
-  become: yes
-  modprobe:
+  become: true
+  community.general.modprobe:
     name: tun
     state: present
 
 - name: Add the bridge module
-  become: yes
-  modprobe:
+  become: true
+  community.general.modprobe:
     name: bridge
     state: present
-
diff --git a/roles/openvpn/tasks/versioncheck.yml b/roles/openvpn/tasks/versioncheck.yml
index 767cd5c..0806f2c 100644
--- a/roles/openvpn/tasks/versioncheck.yml
+++ b/roles/openvpn/tasks/versioncheck.yml
@@ -1,40 +1,41 @@
 ---
 - name: Create directory for versionscheck
   become: true
-  file:
-    path: '/etc/ansible-version'
+  ansible.builtin.file:
+    path: '/etc/.ansible-version'
     state: directory
     mode: 0755
-  when: submodules_versioncheck|bool
 
 - name: check playbook version
   become: true
-  slurp:
-    src: "{{ playbook_version_path }}"
+  ansible.builtin.slurp:
+    src: "/etc/.ansible-version/{{ playbook_version_path }}"
   register: playbook_version
-  when: submodules_versioncheck|bool
-  ignore_errors: yes
+  ignore_errors: true
   failed_when: false
 
 - name: Print remote role version
-  debug:
+  ansible.builtin.debug:
     msg: "Remote role version: {{ playbook_version.content | default('Y3VycmVudGx5IG5vdCBkZXBsb3llZAo=') | b64decode | string }}"
-  when: submodules_versioncheck|bool
 
 - name: Print locale role version
-  debug:
+  ansible.builtin.debug:
     msg: "Local role version: '{{ playbook_version_number|string }}'."
-  when: submodules_versioncheck|bool
 
 - name: Check if your version is outdated
-  fail:
+  ansible.builtin.fail:
     msg: "Your ansible module has the version '{{ playbook_version_number }}' and is outdated. You need to update it!"
   when:
     - playbook_version.content|default("Mgo=")|b64decode|int - 1 >= playbook_version_number|int and submodules_versioncheck|bool
 
+- name: check if '/etc/ansible-version/' is empty
+  ansible.builtin.find:
+    paths: '/etc/ansible-version/'
+  register: filesFound
+
 - name: write new version to remote disk
   become: true
-  copy:
+  ansible.builtin.copy:
     content: "{{ playbook_version_number }}"
-    dest: "{{ playbook_version_path }}"
-  when: submodules_versioncheck|bool
+    dest: "/etc/.ansible-version/{{ playbook_version_path }}"
+    mode: '0644'
diff --git a/roles/openvpn/vars/main.yml b/roles/openvpn/vars/main.yml
new file mode 100644
index 0000000..0a27dd1
--- /dev/null
+++ b/roles/openvpn/vars/main.yml
@@ -0,0 +1,3 @@
+---
+playbook_version_number: 1337
+playbook_version_path: 'openvpn__random__4FWvXf4WPrjttnKnVPMzkXTtNVkz4Tg.version