From 80646217d98031421a847613c16c0a1f85dc63bd Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 19 Jan 2013 16:36:51 -0200
Subject: Upgrading for 2.7 compatibility --config

---
 manifests/init.pp    | 9 +++------
 manifests/vserver.pp | 9 +++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 30638a1..1406d12 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,12 +16,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import "vserver.pp"
-
-# whether to log kernel messages
-$log_kernel_msgs = true
-
-class syslog-ng {
+class syslog-ng(
+  $log_kernel_msgs = true
+) {
   # the needed packages
   package { "syslog-ng": ensure => installed, }
 
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index baf368a..0c1e344 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -1,8 +1,9 @@
 class syslog-ng::vserver {
   # syslog-ng class for vservers
   # where is not possible to log kernel msgs
-  $log_kernel_msgs = false
-  include syslog-ng
+  class { 'syslog-ng':
+    log_kernel_msgs => false,
+  }
 
   # Manage this file due to
   # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625488
@@ -12,7 +13,7 @@ class syslog-ng::vserver {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    source  => "puppet://$server/modules/syslog-ng/logrotate",
+    source  => "puppet:///modules/syslog-ng/logrotate",
   }
 
   # Manage this file due to
@@ -23,7 +24,7 @@ class syslog-ng::vserver {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    source  => "puppet://$server/modules/syslog-ng/default",
+    source  => "puppet:///modules/syslog-ng/default",
     notify  => Service["syslog-ng"],
   }
 }
-- 
cgit v1.2.3