diff options
Diffstat (limited to 'manifests/role')
| -rw-r--r-- | manifests/role/mail.pp | 18 | ||||
| -rw-r--r-- | manifests/role/web.pp | 86 |
2 files changed, 47 insertions, 57 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, } } diff --git a/manifests/role/web.pp b/manifests/role/web.pp index a497108..2d25c9c 100644 --- a/manifests/role/web.pp +++ b/manifests/role/web.pp @@ -6,53 +6,53 @@ class nodo::role::web inherits nodo::base::virtual { } # Munin - $munin = hiera('nodo::munin_node::manage', True) - if $munin == true { - munin::plugin { [ 'apache_accesses', 'apache_processes', 'apache_volume' ]: - ensure => present, - } - - package { 'libcache-cache-perl': # needed by munin mysql plugin - ensure => present, - } - - munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]: - ensure => present, - config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", - } - } + #$munin = hiera('nodo::munin_node::manage', True) + #if $munin == true { + # munin::plugin { [ 'apache_accesses', 'apache_processes', 'apache_volume' ]: + # ensure => present, + # } + # + # # Needed by munin mysql plugin + # package { 'libcache-cache-perl': + # ensure => present, + # } + # + # munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]: + # ensure => present, + # config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", + # } + #} # Classes for web nodes include database - - # Put your custom sites and users here include websites - - # Reprepro configuration - $reprepro = hiera('nodo::web::reprepro', false) - $reprepro_basedir = '/var/reprepro' - - case $reprepro { - true,'enabled': { - class { 'reprepro': - basedir => '/var/reprepro', - uploaders => hiera('nodo::web::reprepro_uploaders', [ ]), - } - - include reprepro::cron - } - 'disabled': { - class { 'reprepro::disabled': - basedir => '/var/reprepro', - } - } - 'purged': { - class { 'reprepro::purged': - basedir => '/var/reprepro', - } - } - false,default: { } - } + include domain_check + + ## Reprepro configuration + #$reprepro = hiera('nodo::web::reprepro', false) + #$reprepro_basedir = '/var/reprepro' + # + #case $reprepro { + # true,'enabled': { + # class { 'reprepro': + # basedir => '/var/reprepro', + # uploaders => hiera('nodo::web::reprepro_uploaders', [ ]), + # } + # + # include reprepro::cron + # } + # 'disabled': { + # class { 'reprepro::disabled': + # basedir => '/var/reprepro', + # } + # } + # 'purged': { + # class { 'reprepro::purged': + # basedir => '/var/reprepro', + # } + # } + # false,default: { } + #} backupninja::svn { "svn": src => "/var/svn", |