more BSD compatability from admin@immerda.ch

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index ff7bf53c9b173540ea3ee925cdf92c9b5d247358..e3dbe23f22477cadd4980343d892d72e87953c02 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -19,7 +19,7 @@ define concatenated_file (
        $header = '',
        # a file with content to append
        $footer = '',
-       $mode = 0644, $owner = root, $group = root
+       $mode = 0644, $owner = root, $group = 0
        )
 {
 
@@ -70,7 +70,7 @@ define concatenated_file (
 # The file can be referenced as File["cf_part_${name}"]
 define concatenated_file_part (
        $dir, $content = '', $ensure = present,
-       $mode = 0644, $owner = root, $group = root 
+       $mode = 0644, $owner = root, $group = 0 
        )
 {
 

diff --git a/manifests/defines/config_file.pp b/manifests/defines/config_file.pp
index c57c9a3bd4535d56c5af79ffec9b94b6a2300c18..3e6bc061b65595834c164f96eea10f904513d383 100644 (file)
--- a/manifests/defines/config_file.pp
+++ b/manifests/defines/config_file.pp
@@ -33,7 +33,7 @@ define config_file ($content = '', $source = '', $ensure = 'present') {
                # keep old versions on the server
                backup => server,
                # default permissions for config files
-               mode => 0644, owner => root, group => root,
+               mode => 0644, owner => root, group => 0,
                # really detect changes to this file
                checksum => md5,
        }

diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp
index 3f7c4c0748880c9dc120a2806838ba9d4c0c9d75..2eb8f98e89e0f4c0eb07009980a5e5fdb1ecc4a1 100644 (file)
--- a/manifests/defines/line.pp
+++ b/manifests/defines/line.pp
@@ -27,13 +27,13 @@ define line($file, $line, $ensure = 'present') {
        case $ensure {
                default : { err ( "unknown ensure value '${ensure}'" ) }
                present: {
-                       exec { "/bin/echo '${line}' >> '${file}'":
-                               unless => "/bin/grep -qFx '${line}' '${file}'"
+                       exec { "echo '${line}' >> '${file}'":
+                               unless => "grep -qFx '${line}' '${file}'"
                        }
                }
                absent: {
-                       exec { "/usr/bin/perl -ni -e 'print unless /^\\Q${line}\\E\$/' '${file}'":
-                               onlyif => "/bin/grep -qFx '${line}' '${file}'"
+                       exec { "perl -ni -e 'print unless /^\\Q${line}\\E\$/' '${file}'":
+                               onlyif => "grep -qFx '${line}' '${file}'"
                        }
                }
        }

diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp
index 657b54d08c3877af762da4891a371fd14b288ec6..cc80eebd8f36798a2843aeb999a4a7a98b112a3a 100644 (file)
--- a/manifests/defines/modules_dir.pp
+++ b/manifests/defines/modules_dir.pp
@@ -7,7 +7,7 @@
 # Usage:
 # modules_dir { ["common", "common/dir1", "common/dir2" ]: }
 define modules_dir (
-               $mode = 0644, $owner = root, $group = root
+               $mode = 0644, $owner = root, $group = 0
        )
 {
        $dir = "/var/lib/puppet/modules/${name}"
@@ -18,7 +18,7 @@ define modules_dir (
                        "/var/lib/puppet/modules/${name}":
                                # workaround
                                #source => [ "puppet://$servername/${name}/modules_dir", "puppet://$servername/common/empty"],
-                               source => "puppet://$servername/files/empty",
+                               source => "puppet://$servername/common/empty",
                                checksum => mtime,
                                recurse => true, purge => true, force => true,
                                mode => $mode, owner => $owner, group => $group;

diff --git a/manifests/init.pp b/manifests/init.pp
index 577b0c67a4c2be7cc3f70567f5fd2537116b4bf0..d2847823e0032c0c86374eeace312e27ec3d2908 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,8 +8,9 @@ file {
        "/var/lib/puppet/modules":
                ensure => directory,
                source => "puppet://$servername/common/modules/",
+               ignore => ".svn",
                recurse => true, purge => true, force => true,
-               mode => 0755, owner => root, group => root;
+               mode => 0755, owner => root, group => 0;
 }
 
 import "defines/*.pp"