From bd098f1691307685958d4a07caba9812c025e163 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 5 Jan 2015 17:03:20 -0800
Subject: vpn: each openvpn process needs a unique status file name. closes
 #6608

---
 puppet/modules/site_openvpn/manifests/server_config.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_openvpn')

diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 466f6d00..221c79a7 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -57,6 +57,8 @@ define site_openvpn::server_config(
   $management, $config, $tls_remote = undef) {
 
   $openvpn_configname = $name
+  $shortname = regsubst(regsubst($name, '_config', ''), '_', '-')
+  $openvpn_status_filename = "/var/run/openvpn-status-${shortname}"
 
   concat {
     "/etc/openvpn/${openvpn_configname}.conf":
@@ -187,7 +189,7 @@ define site_openvpn::server_config(
       server => $openvpn_configname;
     "status ${openvpn_configname}":
       key    => 'status',
-      value  => '/var/run/openvpn-status 10',
+      value  => "${openvpn_status_filename} 10",
       server => $openvpn_configname;
     "status-version ${openvpn_configname}":
       key    => 'status-version',
-- 
cgit v1.2.3


From bb07407485ed1626221a1190cc2fb2789f95ed22 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 15 Apr 2015 16:12:11 -0700
Subject: clean up logging mess: add 'logfile' define, mv openvpn and stunnel
 logs to their own files, fix mx logwatch path.

---
 puppet/modules/site_openvpn/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'puppet/modules/site_openvpn')

diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp
index d6f9150b..e2a3124e 100644
--- a/puppet/modules/site_openvpn/manifests/init.pp
+++ b/puppet/modules/site_openvpn/manifests/init.pp
@@ -228,6 +228,7 @@ class site_openvpn {
       order   => 10;
   }
 
+  leap::logfile { 'openvpn': }
   include site_check_mk::agent::openvpn
 
 }
-- 
cgit v1.2.3