From: Stephen Gran Date: Sun, 15 Mar 2009 15:22:58 +0000 (+0000) Subject: Add default File template and remove lots of boilerplate X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=19e1deb652a7911e33d4e1504720eb3ad9a431ec;p=dsa-puppet.git Add default File template and remove lots of boilerplate Signed-off-by: Stephen Gran --- diff --git a/manifests/site.pp b/manifests/site.pp index 254cddfe..638b2be0 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2,6 +2,13 @@ Package { require => File["/etc/apt/apt.conf.d/local-recommends"] } +File { + owner => root, + group => root, + mode => 444, + ensure => file, +} + node default { include munin-node include samhain diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index bc0057bd..34b62270 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -4,10 +4,6 @@ class buildd { } file { "/etc/apt/sources.list.d/buildd.list": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/sources.list.d/buildd.list"; require => Package["apt-transport-https"], } diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 876f90c4..23d39a79 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -25,62 +25,23 @@ class debian-org { } file { "/etc/apt/preferences": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/preferences"; "/etc/apt/sources.list.d/backports.org.list": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/sources.list.d/backports.org.list"; - "/etc/apt/sources.list.d/debian.org.list": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/sources.list.d/debian.org.list"; - "/etc/apt/sources.list.d/security.list": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/sources.list.d/security.list"; - "/etc/apt/sources.list.d/volatile.list": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/sources.list.d/volatile.list"; "/etc/apt/apt.conf.d/local-recommends": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/apt.conf.d/local-recommends"; "/etc/apt/apt.conf.d/local-pdiffs": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs"; "/etc/puppet/puppet.conf": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/puppet/puppet.conf", notify => Exec["puppet reload"]; "/etc/default/puppet": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/default/puppet", notify => Exec["puppet restart"]; } @@ -102,10 +63,6 @@ class debian-proliant inherits debian-org { } file { "/etc/apt/sources.list.d/debian.restricted.list": - owner => root, - group => root, - mode => 444, - ensure => file, source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list"; } } diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp index bd3db80b..1bf8a462 100644 --- a/modules/exim/manifests/init.pp +++ b/modules/exim/manifests/init.pp @@ -11,128 +11,72 @@ class exim { purge => true ; "/etc/exim4/exim4.conf": - owner => root, - group => root, - mode => 644, - ensure => file, source => [ "puppet:///exim/per-host/$fqdn/exim4.conf", "puppet:///exim/common/exim4.conf" ], require => Package["exim4-daemon-heavy"], notify => Exec["exim4 reload"] ; "/etc/exim4/blacklist": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/blacklist", "puppet:///exim/common/blacklist" ] ; "/etc/exim4/callout_users": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/callout_users", "puppet:///exim/common/callout_users" ] ; "/etc/exim4/grey_users": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/grey_users", "puppet:///exim/common/grey_users" ] ; "/etc/exim4/helo-check": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/helo-check", "puppet:///exim/common/helo-check" ] ; "/etc/exim4/locals": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/locals", "puppet:///exim/common/locals" ] ; "/etc/exim4/localusers": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/localusers", "puppet:///exim/common/localusers" ] ; "/etc/exim4/rbllist": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/rbllist", "puppet:///exim/common/rbllist" ] ; "/etc/exim4/rcpthosts": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/rcpthosts", "puppet:///exim/common/rcpthosts" ] ; "/etc/exim4/rhsbllist": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/rhsbllist", "puppet:///exim/common/rhsbllist" ] ; "/etc/exim4/virtualdomains": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/virtualdomains", "puppet:///exim/common/virtualdomains" ] ; "/etc/exim4/whitelist": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/whitelist", "puppet:///exim/common/whitelist" ] ; "/etc/logrotate.d/exim4-base": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-base", "puppet:///exim/common/logrotate-exim4-base" ] ; "/etc/logrotate.d/exim4-paniclog": - owner => root, - group => root, - mode => 644, - ensure => file, require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog", "puppet:///exim/common/logrotate-exim4-paniclog" ] diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp index f0fff2aa..40481503 100644 --- a/modules/munin-node/manifests/init.pp +++ b/modules/munin-node/manifests/init.pp @@ -3,9 +3,6 @@ class munin-node { package { munin-node: ensure => latest } file { "/etc/munin/munin-node.conf": - owner => root, - group => root, - mode => 664, source => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf", "puppet:///munin-node/common/munin-node.conf" ], require => Package["munin-node"], diff --git a/modules/samhain/manifests/init.pp b/modules/samhain/manifests/init.pp index 7975fba2..c94e0cce 100644 --- a/modules/samhain/manifests/init.pp +++ b/modules/samhain/manifests/init.pp @@ -3,9 +3,6 @@ class samhain { package { samhain: ensure => latest } file { "/etc/samhain/samhainrc": - owner => root, - group => root, - mode => 444, source => [ "puppet:///samhain/per-host/$fqdn/samhainrc", "puppet:///samhain/common/samhainrc" ], require => Package["samhain"],