Revert "include stunnel in stunnel::service (https://leap.se/code/issues/3861)"
authorMicah Anderson <micah@riseup.net>
Tue, 17 Sep 2013 20:03:05 +0000 (16:03 -0400)
committerMicah Anderson <micah@riseup.net>
Tue, 17 Sep 2013 20:03:05 +0000 (16:03 -0400)
This reverts commit b6fbb5f013976f6ad1448ac744ae50b2b1aa0bd0.

This removes some pieces of service.pp that shouldn't be removed

manifests/service.pp

index b041833..666826d 100644 (file)
@@ -55,19 +55,20 @@ define stunnel::service (
   $verify = false
 ) {
 
-  include stunnel
-
   $real_client = $client ? { default => 'yes' }
   $real_pid = $pid ? { false => "/${name}.pid", default => $pid }
 
-  file { "/etc/stunnel/${name}.conf":
-    ensure  => $ensure,
-    content => template('stunnel/service.conf.erb'),
-    require => File['/etc/stunnel'],
-    notify  => Service[stunnel],
-    owner   => root,
-    group   => 0,
-    mode    => '0600';
+  $stunnel_compdir = "${::puppet_vardir}/stunnel4/configs"
+
+  file {
+    "${stunnel_compdir}/${name}.conf":
+      ensure  => $ensure,
+      content => template('stunnel/service.conf.erb'),
+      require => Package['stunnel'],
+      notify  => Exec['refresh_stunnel'],
+      owner   => root,
+      group   => 0,
+      mode    => '0600';
   }
 
   if $use_nagios {