Replace syslog-ng by rsyslog

diff --git a/manifests/base.pp b/manifests/base.pp
index f7e80b8e677a31287244ad6c5e5877c202fbc6b2..fa6eaa9e35962fbf85a913671e968d34aa941ce3 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -17,6 +17,10 @@ class nodo::base {
   #class { 'nodo::subsystem::hosts': }
   class { 'nodo::subsystem::motd': }
 
+  # Syslog facility
+  include rsyslog
+  class { 'syslog-ng::vserver': ensure => absent; }
+
   # Common utilities
   include nodo::utils
 

diff --git a/manifests/base/host.pp b/manifests/base/host.pp
index 08ddcd9fe5af2d61956136689601558760b9fb30..e44b1cfed225290a3621701710a4da26159fdcf2 100644 (file)
--- a/manifests/base/host.pp
+++ b/manifests/base/host.pp
@@ -7,7 +7,6 @@ class nodo::base::host {
   include nodo::subsystem::resolver
   include nodo::utils::physical
   include nodo::utils::storage::crypto
-  class { 'syslog-ng': }
 
   nodo::subsystem::monkeysphere { "${::hostname}": }
 

diff --git a/manifests/base/plug.pp b/manifests/base/plug.pp
index 756eb3c8edb1ad703677f5349394f670facedcfb..2ef90654b40b780d1fcb16f4cfd66c0cbc4f5ea7 100644 (file)
--- a/manifests/base/plug.pp
+++ b/manifests/base/plug.pp
@@ -1,5 +1,4 @@
 class nodo::base::plug {
-  include syslog-ng
   include nodo::utils::plug
   include nodo::utils::physical
   include nodo::subsystem::sysctl

diff --git a/manifests/base/raspberrypi.pp b/manifests/base/raspberrypi.pp
index 7ca658af48dbcc2d3fec4fc3a7defe5609e4e7a0..cba616fd28260162e92f245ef4ac2e76e2024378 100644 (file)
--- a/manifests/base/raspberrypi.pp
+++ b/manifests/base/raspberrypi.pp
@@ -1,5 +1,4 @@
 class nodo::base::raspberrypi {
-  include syslog-ng
   include nodo::utils::physical
   include nodo::utils::storage::archive
 

diff --git a/manifests/base/virtual.pp b/manifests/base/virtual.pp
index 55b75ebe8e2e1928bcae80e872fb941b651d66c2..db7d515617f7db5baa6066190569b1323ad3d078 100644 (file)
--- a/manifests/base/virtual.pp
+++ b/manifests/base/virtual.pp
@@ -1,6 +1,5 @@
 class nodo::base::virtual {
   class { 'ntp::timezone': }
-  class { 'syslog-ng::vserver': }
 
   backupninja::sys { "sys":
     ensure     => present,