aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-02 14:40:35 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-02 14:40:35 -0300
commit9b7a91d07eb6086c5ba4a30d7e26b8178381965e (patch)
treea5e769c46c792376e1382a5f771cedf0f66f2516
parent4e158b1c520e4049e7ccd70c8c642c63115a2c81 (diff)
downloadpuppet-nodo-9b7a91d07eb6086c5ba4a30d7e26b8178381965e.tar.gz
puppet-nodo-9b7a91d07eb6086c5ba4a30d7e26b8178381965e.tar.bz2
Replace syslog-ng by rsyslog
-rw-r--r--manifests/base.pp4
-rw-r--r--manifests/base/host.pp1
-rw-r--r--manifests/base/plug.pp1
-rw-r--r--manifests/base/raspberrypi.pp1
-rw-r--r--manifests/base/virtual.pp1
5 files changed, 4 insertions, 4 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index f7e80b8..fa6eaa9 100644
--- 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 08ddcd9..e44b1cf 100644
--- 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 756eb3c..2ef9065 100644
--- 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 7ca658a..cba616f 100644
--- 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 55b75eb..db7d515 100644
--- 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,