diff options
Diffstat (limited to 'manifests/subsystem')
| -rw-r--r-- | manifests/subsystem/apt.pp | 3 | ||||
| -rw-r--r-- | manifests/subsystem/monitor/master.pp | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp index 038b503..c927062 100644 --- a/manifests/subsystem/apt.pp +++ b/manifests/subsystem/apt.pp @@ -14,7 +14,8 @@ class nodo::subsystem::apt { ::apt::sources_list { "${::domain}.list": source => [ "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::lsbdistcodename}/${::domain}.list", - "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::domain}.list", ], + "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::domain}.list", + "puppet:///modules/nodo/etc/sources.list.d/domain.list", ], ensure => $apt_domain_source ? { true => present, default => absent, diff --git a/manifests/subsystem/monitor/master.pp b/manifests/subsystem/monitor/master.pp index 1f97a36..dd6defa 100644 --- a/manifests/subsystem/monitor/master.pp +++ b/manifests/subsystem/monitor/master.pp @@ -13,8 +13,13 @@ class nodo::subsystem::monitor::master { default => 'absent', } - # Munin configuration for apache + # Legacy configuration file { '/etc/apache2/conf.d/munin': + ensure => absent, + } + + # Munin configuration for apache + file { '/etc/apache2/conf.d/munin.conf': ensure => present, owner => root, group => root, |