diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2016-02-08 03:36:43 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2016-02-08 03:36:43 -0200 |
commit | a9c544369f3999b868cfc1eb0dcb10e050defcc1 (patch) | |
tree | 2f06ad6d179f2677368b2ec7d0932d5aaa0ad2ea /manifests/role/web.pp | |
parent | 6097bca6f5302765007f65a52f87999dbaefcff9 (diff) | |
download | puppet-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/web.pp')
-rw-r--r-- | manifests/role/web.pp | 86 |
1 files changed, 43 insertions, 43 deletions
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", |