From 3bffb1b18082df532a817a3ab3aa74196d3dd34a Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Tue, 19 Oct 2021 22:07:35 +0200
Subject: [PATCH] cleanup syntax

---
 handlers/main.yml |  2 +-
 tasks/setup.yml   | 32 ++++++++++++--------------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 5fcfc32..33454b1 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Restart openvpn client
   service:
-    name: "openvpn@{{ openvpn_client_name }}"
+    name: "{{ __openvpn_service_prefix }}@{{ openvpn_client_name }}"
     state: "{{ 'restarted' if openvpn_service_state == 'started' else 'stopped' }}"
     enabled: yes
   listen: __openvpn_restart
diff --git a/tasks/setup.yml b/tasks/setup.yml
index a244dd9..db6fb5b 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -32,26 +32,18 @@
         dest: "{{ item.dest }}"
         mode: "{{ item.mode }}"
       loop:
-        - {
-            src: "{{ openvpn_client_ca_source | default('') }}",
-            dest: "/etc/openvpn/certs/{{ openvpn_client_ca_file }}",
-            mode: "0640",
-          }
-        - {
-            src: "{{ openvpn_client_cert_source | default('') }}",
-            dest: "/etc/openvpn/certs/{{ openvpn_client_cert_file }}",
-            mode: "0640",
-          }
-        - {
-            src: "{{ openvpn_client_key_source | default('') }}",
-            dest: "/etc/openvpn/certs/{{ openvpn_client_key_file }}",
-            mode: "0600",
-          }
-        - {
-            src: "{{ openvpn_client_ta_source | default('') }}",
-            dest: "/etc/openvpn/certs/{{ openvpn_client_ta_file }}",
-            mode: "0600",
-          }
+        - src: "{{ openvpn_client_ca_source | default('') }}"
+          dest: "/etc/openvpn/certs/{{ openvpn_client_ca_file }}"
+          mode: "0640"
+        - src: "{{ openvpn_client_cert_source | default('') }}"
+          dest: "/etc/openvpn/certs/{{ openvpn_client_cert_file }}"
+          mode: "0640"
+        - src: "{{ openvpn_client_key_source | default('') }}"
+          dest: "/etc/openvpn/certs/{{ openvpn_client_key_file }}"
+          mode: "0600"
+        - src: "{{ openvpn_client_ta_source | default('') }}"
+          dest: "/etc/openvpn/certs/{{ openvpn_client_ta_file }}"
+          mode: "0600"
       loop_control:
         label: "{{ item.dest }}"
       when: item.src | length > 0