fix whitespace (remove tabs & trailing whitespace)

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 8010c88e28c1631adb40329a022f115bbf5ffd3c..491e2c8154870369a298e8494193a94cdeee7842 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -22,87 +22,78 @@
 #
 # Depend on File[$name] to change if and only if its contents change. Notify
 # Exec["concat_${name}"] if you want to force an update.
-# 
+#
 # Usage:
 #  concatenated_file { "/etc/some.conf":
-#      dir => "/etc/some.conf.d",
+#      dir => "/etc/some.conf.d",
 #  }
 define concatenated_file (
-       # where the snippets are located
-       $dir = '',
-       # a file with content to prepend
-       $header = '',
-       # a file with content to append
-       $footer = '',
-       # default permissions for the target file
-       $mode = 0644, $owner = root, $group = 0
-       )
+    # where the snippets are located
+    $dir = '',
+    # a file with content to prepend
+    $header = '',
+    # a file with content to append
+    $footer = '',
+    # default permissions for the target file
+    $mode = 0644, $owner = root, $group = 0
+    )
 {
     include common::moduledir::common::cf
 
-       $dir_real = $dir ? { '' => "${name}.d", default => $dir }
-
-       $tmp_file_name = regsubst($dir_real, '/', '_', 'G')
-       $tmp_file = "${common::moduledir::module_dir_path}/${tmp_file_name}"
+    $dir_real = $dir ? { '' => "${name}.d", default => $dir }
 
-       if defined(File[$dir_real]) {
-               debug("${dir_real} already defined")
-       } else {
-               file {
-                       $dir_real:
-                               source => "puppet:///modules/common/empty",
-                               checksum => mtime,
-                               ignore => '.ignore',
-                               recurse => true, purge => true, force => true,
-                               mode => $mode, owner => $owner, group => $group,
-                               notify => Exec["concat_${name}"];
-               }
-       }
+    $tmp_file_name = regsubst($dir_real, '/', '_', 'G')
+    $tmp_file = "${common::moduledir::module_dir_path}/${tmp_file_name}"
 
-       file {
-               $tmp_file:
-                       ensure => present, checksum => md5,
-                       mode => $mode, owner => $owner, group => $group;
-               # decouple the actual file from the generation process by using a
-               # temporary file and puppet's source mechanism. This ensures that events
-               # for notify/subscribe will only be generated when there is an actual
-               # change.
-               $name:
-                       ensure => present, checksum => md5,
-                       source => $tmp_file,
-                       mode => $mode, owner => $owner, group => $group,
-                       require => File[$tmp_file];
-       }
+    if defined(File[$dir_real]) {
+        debug("${dir_real} already defined")
+    } else {
+        file {
+            $dir_real:
+                source => "puppet:///modules/common/empty",
+                checksum => mtime,
+                ignore => '.ignore',
+                recurse => true, purge => true, force => true,
+                mode => $mode, owner => $owner, group => $group,
+                notify => Exec["concat_${name}"];
+        }
+    }
 
-       # if there is a header or footer file, add it
-       $additional_cmd = $header ? {
-               '' => $footer ? {
-                       '' => '',
-                       default => "| cat - '${footer}' "
-               },
-               default => $footer ? { 
-                       '' => "| cat '${header}' - ",
-                       default => "| cat '${header}' - '${footer}' "
-               }
-       }
+    file {
+        $tmp_file:
+            ensure => present, checksum => md5,
+            mode => $mode, owner => $owner, group => $group;
+        # decouple the actual file from the generation process by using a
+        # temporary file and puppet's source mechanism. This ensures that events
+        # for notify/subscribe will only be generated when there is an actual
+        # change.
+        $name:
+            ensure => present, checksum => md5,
+            source => $tmp_file,
+            mode => $mode, owner => $owner, group => $group,
+            require => File[$tmp_file];
+    }
 
-       # use >| to force clobbering the target file
-       exec { "concat_${name}":
-               command => "/usr/bin/find ${dir_real} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat ${additional_cmd} >| ${tmp_file}",
-               subscribe => [ File[$dir_real] ],
-               before => File[$tmp_file],
-               alias => [ "concat_${dir_real}"],
-               loglevel => info
-       }
-       #case $header {
-               #'': {}
-               #default: { Exec["concat_${name}"] { subscribe +> File[$header] } }
-       #}
+    # if there is a header or footer file, add it
+    $additional_cmd = $header ? {
+        '' => $footer ? {
+            '' => '',
+            default => "| cat - '${footer}' "
+        },
+        default => $footer ? {
+            '' => "| cat '${header}' - ",
+            default => "| cat '${header}' - '${footer}' "
+        }
+    }
 
-       #case $footer {
-               #'': {}
-               #default: { Exec["concat_${name}"] { subscribe +> File[$footer] } }
-       #}
+    # use >| to force clobbering the target file
+    exec { "concat_${name}":
+        command => "/usr/bin/find ${dir_real} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat ${additional_cmd} >| ${tmp_file}",
+        subscribe => [ File[$dir_real] ],
+        before => File[$tmp_file],
+        alias => [ "concat_${dir_real}"],
+        loglevel => info
+    }
 
 }
 
@@ -110,17 +101,17 @@ define concatenated_file (
 # Add a snippet called $name to the concatenated_file at $dir.
 # The file can be referenced as File["cf_part_${name}"]
 define concatenated_file_part (
-       $dir, $content = '', $ensure = present,
-       $mode = 0644, $owner = root, $group = 0 
-       )
+    $dir, $content = '', $ensure = present,
+    $mode = 0644, $owner = root, $group = 0
+    )
 {
 
-       file { "${dir}/${name}":
-               ensure => $ensure, content => $content,
-               mode => $mode, owner => $owner, group => $group,
-               alias => "cf_part_${name}",
-               notify => Exec["concat_${dir}"],
-       }
+    file { "${dir}/${name}":
+        ensure => $ensure, content => $content,
+        mode => $mode, owner => $owner, group => $group,
+        alias => "cf_part_${name}",
+        notify => Exec["concat_${dir}"],
+    }
 
 }
 

diff --git a/manifests/defines/config_file.pp b/manifests/defines/config_file.pp
index cd6ccc36ab6fe5b51bf4b945606612695c0a8ff4..e580715577a5f0acff5b67e96eebf4aaba9552c9 100644 (file)
--- a/manifests/defines/config_file.pp
+++ b/manifests/defines/config_file.pp
@@ -4,10 +4,10 @@
 
 # Usage:
 # config_file { filename:
-#      content => "....\n",
+#     content => "....\n",
 # }
 #
-# Examples: 
+# Examples:
 #
 # To create the file /etc/vservers/${vs_name}/context with specific
 # content:
@@ -28,26 +28,26 @@
 # }
 
 define config_file ($content = '', $source = '', $ensure = 'present') {
-       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
-               checksum => md5,
-       }
+    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
+        checksum => md5,
+    }
 
-       case $source {
-               '': { }
-               default: { File[$name] { source => $source } }
-       }
+    case $source {
+        '': { }
+        default: { File[$name] { source => $source } }
+    }
+
+    case $content {
+        '': { }
+        default: { File[$name] { content => $content } }
+    }
 
-       case $content {
-               '': { }
-               default: { File[$name] { content => $content } }
-       }
-                               
 }
 
 

diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
index 73f5d75fc0e74eda30f378c5481bef644ee7ed0e..7e2d10b0981cb6db520aafa8693ec2b1c99fae80 100644 (file)
--- a/manifests/defines/module_dir.pp
+++ b/manifests/defines/module_dir.pp
@@ -12,30 +12,30 @@
 # file { "${common::moduledir::module_dir_path}/somedir/somefile": }
 
 define module_dir (
-               $mode = 0644, $owner = root, $group = 0
-       )
+        $mode = 0644, $owner = root, $group = 0
+    )
 {
-       include common::moduledir
-       $dir = "$common::moduledir::module_dir_path/${name}"
-       if defined(File[$dir]) {
-               debug("${dir} already defined")
-       } else {
-               file {
-                       $dir:
-                               source => [ "puppet://$server/modules/${name}/modules_dir", "puppet://$server/modules/common/empty"],
-                               checksum => mtime,
-                               # ignore the placeholder
-                               ignore => '\.ignore', 
-                               recurse => true, purge => true, force => true,
-                               mode => $mode, owner => $owner, group => $group;
-               }
-       }
+    include common::moduledir
+    $dir = "$common::moduledir::module_dir_path/${name}"
+    if defined(File[$dir]) {
+        debug("${dir} already defined")
+    } else {
+        file {
+            $dir:
+                source => [ "puppet://$server/modules/${name}/modules_dir", "puppet://$server/modules/common/empty"],
+                checksum => mtime,
+                # ignore the placeholder
+                ignore => '\.ignore',
+                recurse => true, purge => true, force => true,
+                mode => $mode, owner => $owner, group => $group;
+        }
+    }
 }
 
 # alias for compatibility
 define modules_dir (
-               $mode = 0644, $owner = root, $group = 0
-       )
+        $mode = 0644, $owner = root, $group = 0
+    )
 {
   module_dir { $name: mode => $mode, owner => $owner, group => $group }
 }

diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp
index 3c436ef8b3130e8e85ccdba595ed2aa9c076ae0e..6f84a323fb55f7a418a9f05bf4a0bf15a9869c7d 100644 (file)
--- a/manifests/defines/module_file.pp
+++ b/manifests/defines/module_file.pp
@@ -6,28 +6,28 @@
 
 # Usage:
 # modules_file { "module/file":
-#      source => "puppet://${server}/...",
-#      mode   => 644,   # default
-#      owner  => root,  # default
-#              group  => 0,     # default
+#     source => "puppet://${server}/...",
+#     mode   => 644,   # default
+#     owner  => root,  # default
+#        group  => 0,     # default
 # }
 define module_file (
-               $source,
-               $mode = 0644, $owner = root, $group = 0
-       )
+        $source,
+        $mode = 0644, $owner = root, $group = 0
+    )
 {
-       include common::moduledir
-       file {
-               "${common::moduledir::module_dir_path}/${name}":
-                       source => $source,
-                       mode => $mode, owner => $owner, group => $group;
-       }
+    include common::moduledir
+    file {
+        "${common::moduledir::module_dir_path}/${name}":
+            source => $source,
+            mode => $mode, owner => $owner, group => $group;
+    }
 }
 
 # alias for compatibility
 define modules_file (
-               $source, $mode = 0644, $owner = root, $group = 0
-       )
+        $source, $mode = 0644, $owner = root, $group = 0
+    )
 {
   module_file { $name: source => $source, mode => $mode, owner => $owner, group => $group }
 }

diff --git a/manifests/defines/replace.pp b/manifests/defines/replace.pp
index c13325e6540041f4a4c8a9719fb4eea1128e6b4c..7dabe5926688e98de4452ceab07f8a43071639c8 100644 (file)
--- a/manifests/defines/replace.pp
+++ b/manifests/defines/replace.pp
@@ -4,7 +4,7 @@
 
 # Usage:
 #
-# replace { description: 
+# replace { description:
 #           file => "filename",
 #           pattern => "regexp",
 #           replacement => "replacement"
@@ -14,17 +14,17 @@
 # with a new port, but only disturbing the file when needed:
 #
 # replace { set_munin_node_port:
-#      file => "/etc/munin/munin-node.conf",
-#      pattern => "^port (?!$port)[0-9]*",
-#      replacement => "port $port"
-# }  
+#     file => "/etc/munin/munin-node.conf",
+#     pattern => "^port (?!$port)[0-9]*",
+#     replacement => "port $port"
+# }
 
 define replace($file, $pattern, $replacement) {
-       $pattern_no_slashes = slash_escape($pattern)
-       $replacement_no_slashes = slash_escape($replacement)
-       exec { "replace_${pattern}_${file}":
-               command => "/usr/bin/perl -pi -e 's/${pattern_no_slashes}/${replacement_no_slashes}/' '${file}'",
-               onlyif => "/usr/bin/perl -ne 'BEGIN { \$ret = 1; } \$ret = 0 if /${pattern_no_slashes}/ && ! /\\Q${replacement_no_slashes}\\E/; END { exit \$ret; }' '${file}'",
-               alias => "exec_$name",
-       }
+    $pattern_no_slashes = slash_escape($pattern)
+    $replacement_no_slashes = slash_escape($replacement)
+    exec { "replace_${pattern}_${file}":
+        command => "/usr/bin/perl -pi -e 's/${pattern_no_slashes}/${replacement_no_slashes}/' '${file}'",
+        onlyif => "/usr/bin/perl -ne 'BEGIN { \$ret = 1; } \$ret = 0 if /${pattern_no_slashes}/ && ! /\\Q${replacement_no_slashes}\\E/; END { exit \$ret; }' '${file}'",
+        alias => "exec_$name",
+    }
 }