From 75bc781369a85edeea3dee1a797067dffc2964fc Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Mon, 16 Nov 2020 15:01:28 +0100
Subject: [PATCH] use tags to notify service, new dependency for tls_auth
 generation

service should start after tls_auth certificate is generated.
---
 manifests/init.pp   | 3 +++
 manifests/server.pp | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index fafd3a2..b342888 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,6 +24,9 @@
   }
 
   if $manage_service {
+    Exec <| tag == 'openvpn' |> ~> Service['openvpn']
+    File <| tag == 'openvpn' |> ~> Service['openvpn']
+
     service { 'openvpn':
       ensure  => running,
       enable  => true,
diff --git a/manifests/server.pp b/manifests/server.pp
index 2e7a9ef..3db71c3 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -81,6 +81,7 @@
     group   => 0,
     mode    => '0600',
     content => template('openvpn/server.conf.erb'),
+    tag     => 'openvpn',
   }
 
   $fq_dh = $dh ? {
@@ -91,6 +92,7 @@
     cwd     => $openvpn_dir,
     command => "${openssl} dhparam -out ${fq_dh} ${dh_size}",
     creates => $fq_dh,
+    tag     => 'openvpn',
   }
 
   if $tls_auth {
@@ -98,12 +100,7 @@
       cwd     => $openvpn_dir,
       command => "${openvpn_path} --genkey --secret ta.key",
       creates => "${openvpn_dir}/ta.key",
+      tag     => 'openvpn',
     }
   }
-
-  if $openvpn::manage_service {
-    Exec["create ${dh}"] ~> Service['openvpn']
-
-    File["${openvpn_dir}/openvpn.conf"] ~> Service['openvpn']
-  }
 }