From 89be6dc2f6f705efce82fab4bfbd03059ee2b510 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 3 Sep 2009 13:54:28 -0400 Subject: remove 'backup => server' from config_file, as there is no such thing as 'server'. This didn't work as expected because of this error, and in some situations it caused problems (such as when ever file in a directory is considered a config file, such is the case with apt.conf.d ) --- manifests/defines/config_file.pp | 2 -- 1 file changed, 2 deletions(-) (limited to 'manifests') 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 -- cgit v1.2.3 From 8a389425075f54f8c10e2ff08c1aa07827d14622 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 3 Sep 2009 13:57:47 -0400 Subject: fix indentation in line.pp example configuration snippet --- manifests/defines/line.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'manifests') diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp index be5ec31..bc2ece4 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 -- cgit v1.2.3 From 3ff12051c8efabcdfb43b99810ff1c2ea22750a3 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 23 Nov 2009 11:54:04 -0500 Subject: move plugin directory to fit new 0.25.x style and update file paths accordingly --- manifests/defines/concatenated_file.pp | 2 +- manifests/defines/module_dir.pp | 2 +- manifests/init.pp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests') 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/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', diff --git a/manifests/init.pp b/manifests/init.pp index f7298e3..f767030 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,7 @@ file { # for details "/var/lib/puppet/modules": ensure => directory, - source => "puppet:///common/modules", + source => "puppet://$server/modules/common/modules", ignore => ".ignore", recurse => true, purge => true, force => true, mode => 0755, owner => root, group => 0; -- cgit v1.2.3 From 314af5320fd658c7423eb766b2b00a378a20dfb7 Mon Sep 17 00:00:00 2001 From: pietro Date: Fri, 27 Nov 2009 18:23:13 -0800 Subject: fix path to source file. --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index f767030..e0a9435 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,7 @@ file { # for details "/var/lib/puppet/modules": ensure => directory, - source => "puppet://$server/modules/common/modules", + source => "puppet://$server/common/modules", ignore => ".ignore", recurse => true, purge => true, force => true, mode => 0755, owner => root, group => 0; -- cgit v1.2.3 From 1fa98d6183e77517e3ab851072e37e4235a3fe67 Mon Sep 17 00:00:00 2001 From: pietro Date: Fri, 27 Nov 2009 18:35:46 -0800 Subject: fix source path. --- manifests/defines/module_dir.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp index def5c94..d618f3e 100644 --- a/manifests/defines/module_dir.pp +++ b/manifests/defines/module_dir.pp @@ -9,7 +9,7 @@ # of puppet, the full path is /var/lib/puppet/modules/${name}. Every module # should # prefix its module_dirs with its name. # -# By default, the module_dir is loaded from "puppet:///${name}/module_dir". If +# By default, the module_dir is loaded from "puppet:///$server/${name}/module_dir". If # that doesn't exist an empty directory is taken as source. The directory is # purged so that modules do not have to worry about removing cruft. # @@ -27,7 +27,7 @@ define module_dir ( } else { file { $dir: - source => [ "puppet://$server/modules/${name}/module_dir", "puppet://$server/modules/common/empty"], + source => [ "puppet://$server/${name}/module_dir", "puppet://$server/common/empty"], checksum => mtime, # ignore the placeholder ignore => '\.ignore', -- cgit v1.2.3 From 6bd12511bb755993e4dc4f63d50877ad625d8510 Mon Sep 17 00:00:00 2001 From: pietro Date: Fri, 27 Nov 2009 18:58:20 -0800 Subject: Revert "fix path to source file." This reverts commit 314af5320fd658c7423eb766b2b00a378a20dfb7. --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index e0a9435..f767030 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,7 @@ file { # for details "/var/lib/puppet/modules": ensure => directory, - source => "puppet://$server/common/modules", + source => "puppet://$server/modules/common/modules", ignore => ".ignore", recurse => true, purge => true, force => true, mode => 0755, owner => root, group => 0; -- cgit v1.2.3 From 76b0a31a76b8ab7509da3389379daa24b0610f73 Mon Sep 17 00:00:00 2001 From: pietro Date: Fri, 27 Nov 2009 18:58:39 -0800 Subject: Revert "fix source path." This reverts commit 1fa98d6183e77517e3ab851072e37e4235a3fe67. --- manifests/defines/module_dir.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp index d618f3e..def5c94 100644 --- a/manifests/defines/module_dir.pp +++ b/manifests/defines/module_dir.pp @@ -9,7 +9,7 @@ # of puppet, the full path is /var/lib/puppet/modules/${name}. Every module # should # prefix its module_dirs with its name. # -# By default, the module_dir is loaded from "puppet:///$server/${name}/module_dir". If +# By default, the module_dir is loaded from "puppet:///${name}/module_dir". If # that doesn't exist an empty directory is taken as source. The directory is # purged so that modules do not have to worry about removing cruft. # @@ -27,7 +27,7 @@ define module_dir ( } else { file { $dir: - source => [ "puppet://$server/${name}/module_dir", "puppet://$server/common/empty"], + source => [ "puppet://$server/modules/${name}/module_dir", "puppet://$server/modules/common/empty"], checksum => mtime, # ignore the placeholder ignore => '\.ignore', -- cgit v1.2.3