diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-06 17:18:24 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-06 17:18:24 -0200 |
| commit | 0f5508374a63dbf0f7bfeb70e2e8f33bf24f891b (patch) | |
| tree | a8ab9ca3ac254e836367d0d95d2bbfd147cf9496 /manifests/defines | |
| parent | 485929e529e1e662249344faeedb643d2e7b9de8 (diff) | |
| parent | 76b0a31a76b8ab7509da3389379daa24b0610f73 (diff) | |
| download | puppet-common-0f5508374a63dbf0f7bfeb70e2e8f33bf24f891b.tar.gz puppet-common-0f5508374a63dbf0f7bfeb70e2e8f33bf24f891b.tar.bz2 | |
Merge git://labs.riseup.net/module_common
Diffstat (limited to 'manifests/defines')
| -rw-r--r-- | manifests/defines/concatenated_file.pp | 2 | ||||
| -rw-r--r-- | manifests/defines/config_file.pp | 2 | ||||
| -rw-r--r-- | manifests/defines/line.pp | 12 | ||||
| -rw-r--r-- | manifests/defines/module_dir.pp | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp index 8ae855c..b85456c 100644 --- a/manifests/defines/concatenated_file.pp +++ b/manifests/defines/concatenated_file.pp @@ -51,7 +51,7 @@ define concatenated_file ( } else { file { $dir_real: - source => "puppet:///common/empty", + source => "puppet://$server/modules/common/empty", checksum => mtime, ignore => '.ignore', recurse => true, purge => true, force => true, diff --git a/manifests/defines/config_file.pp b/manifests/defines/config_file.pp index 59208ac..781e9ec 100644 --- a/manifests/defines/config_file.pp +++ b/manifests/defines/config_file.pp @@ -37,8 +37,6 @@ define config_file ( { file { $name: ensure => $ensure, - # keep old versions on the server - backup => server, # default permissions for config files mode => 0644, owner => root, group => 0, # really detect changes to this file diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp index 534fd7c..832382f 100644 --- a/manifests/defines/line.pp +++ b/manifests/defines/line.pp @@ -14,12 +14,12 @@ # is a more stable solution with less maintenance headaches afterwards. # # Usage: -# line { -# description: -# file => "filename", -# line => "content", -# ensure => {absent,*present*} -# } +# line { +# description: +# file => "filename", +# line => "content", +# ensure => {absent,*present*} +# } # # Example: # The following ensures that the line "allow ^$munin_host$" exists in diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp index 5b2d340..def5c94 100644 --- a/manifests/defines/module_dir.pp +++ b/manifests/defines/module_dir.pp @@ -27,7 +27,7 @@ define module_dir ( } else { file { $dir: - source => [ "puppet:///${name}/module_dir", "puppet:///common/empty"], + source => [ "puppet://$server/modules/${name}/module_dir", "puppet://$server/modules/common/empty"], checksum => mtime, # ignore the placeholder ignore => '\.ignore', |