From b53d574250598178af298c59be957693eaaddb22 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 13:59:31 -0400
Subject: remove variable defaults, they are handled by the paramterization of
 the class make sure template variables are properly looked up.

---
 manifests/debian.pp | 14 --------------
 manifests/init.pp   |  1 +
 manifests/linux.pp  |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'manifests')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index ee2a2f1..eb4d57a 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -9,20 +9,6 @@ class stunnel::debian inherits stunnel::linux {
     pattern => '/usr/bin/stunnel4',
   }
 
-  # make the /etc/default/stunnel ENABLED configurable with a variable
-  # and default to on
-  case $stunnel::startboot {
-    '': { $stunnel::startboot = '1' }
-    default: { $stunnel::startboot = '1' }
-  }
-
-  # make the /etc/default/stunnel extra configurable with a variable
-  # and default to adding nothing to the default file
-  case $stunnel::default_extra {
-    '': { $stunnel::default_extra = '' }
-    default: { $stunnel::default_extra = '' }
-  }
-
   file { '/etc/default/stunnel4':
     content => template('stunnel/Debian/default'),
     require => Package['stunnel4'],
diff --git a/manifests/init.pp b/manifests/init.pp
index 1204909..f7f72b8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,6 +19,7 @@
 
 class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra )
 {
+
   case $::operatingsystem {
     debian: { class { 'stunnel::debian': } }
     centos: { class {  'stunnel::centos': } }
diff --git a/manifests/linux.pp b/manifests/linux.pp
index 972f21c..a4a926e 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,6 +1,5 @@
 class stunnel::linux inherits stunnel::base {
 
-  if $stunnel::ensure_version == '' { $stunnel::ensure_version = 'installed' }
   package { 'stunnel':
     ensure => $stunnel::ensure_version
   }
-- 
cgit v1.2.3