Upgrading syslog-ng

diff --git a/manifests/physical.pp b/manifests/physical.pp
index 0c4409824e17042b46e46c152944852026cc8998..bb026d46c104e5ffc9ad0ad244185eb188200498 100644 (file)
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -1,5 +1,4 @@
 class nodo::physical inherits nodo {
-  include syslog-ng
   include initramfs
   include modprobe
   include firewire
@@ -10,6 +9,8 @@ class nodo::physical inherits nodo {
   include resolver
   include monkeysphere_nodo
 
+  class { 'syslog-ng': }
+
   # SSL computational DoS mitigation
   # See http://vincent.bernat.im/en/blog/2011-ssl-dos-mitigation.html
   $firewall_ssl_ratelimit = $firewall_ssl_ratelimit ? {

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index e41f729d1a9ea728d4191b3d925ca5a1695d82ca..8cebffe8e2b4ceb58603c6e70d1b1b2179e02079 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -1,6 +1,7 @@
 class nodo::vserver inherits nodo {
   include timezone
-  include syslog-ng::vserver
+
+  class { 'syslog-ng::vserver': }
 
   class { 'sshd':
     listen_address          => $sshd_listen_address,