aboutsummaryrefslogtreecommitdiff
path: root/manifests/role/mail.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-02-08 03:36:43 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-02-08 03:36:43 -0200
commita9c544369f3999b868cfc1eb0dcb10e050defcc1 (patch)
tree2f06ad6d179f2677368b2ec7d0932d5aaa0ad2ea /manifests/role/mail.pp
parent6097bca6f5302765007f65a52f87999dbaefcff9 (diff)
downloadpuppet-nodo-a9c544369f3999b868cfc1eb0dcb10e050defcc1.tar.gz
puppet-nodo-a9c544369f3999b868cfc1eb0dcb10e050defcc1.tar.bz2
Initial cleanup
Remove munin, fstab, crypttab, gdm and old subsystems. This major change is motivated by the fact that the configuration has grown too much along the years and is difficult to maintain. Simplification is then necessary to keep going.
Diffstat (limited to 'manifests/role/mail.pp')
-rw-r--r--manifests/role/mail.pp18
1 files changed, 4 insertions, 14 deletions
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 2383ada..87a928b 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -1,29 +1,19 @@
class nodo::role::mail {
class { [ 'nodo::role::virtual', 'mail::system' ]: }
- # Config parameters
- $delivery = hiera('nodo::subsystem::mail::delivery', 'exim')
- $virtual = hiera('mail::virtual', false)
-
# Graph postfix
munin::plugin { [ 'postfix_mailqueue', 'postfix_mailstats' ]:
config => 'user root',
- ensure => $delivery ? {
- 'postfix' => present,
- default => absent,
- },
+ ensure => present,
}
- # Graph mysql
- package { 'libcache-cache-perl': # needed by munin mysql plugin
+ # Graph mysql, needed by munin mysql plugin
+ package { 'libcache-cache-perl':
ensure => present,
}
munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf",
- ensure => $virtual ? {
- true => present,
- default => absent,
- },
+ ensure => present,
}
}