Merge branch 'master' into 'master'

Merge with immerda

See merge request !1

1 files changed, 0 insertions, 47 deletions

diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp
deleted file mode 100644
index 5977b2d..0000000
--- a/manifests/defines/module_file.pp
+++ /dev/null
@@ -1,47 +0,0 @@
-# common/manifests/defines/modules_file.pp -- use a modules_dir to store module
-# specific files
-#
-# Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
-# See LICENSE for the full license granted to you.
-
-# Put a file into module-local storage.
-#
-# Usage:
-# modules_file { "module/file":
-#     source => "puppet:///...",
-#     mode   => 644,   # default
-#     owner  => root,  # default
-#     group  => 0,     # default
-# }
-define module_file (
-	$source,
-	$ensure = present,
-	$m_alias = undef,
-	$mode = 0644, $owner = root, $group = 0
-    )
-{
-    include common::moduledir
-    file {
-        "${common::moduledir::module_dir_path}/${name}":
-            source => $source,
-            ensure => $ensure,
-            alias => $m_alias,
-            mode => $mode, owner => $owner, group => $group;
-    }
-}
-
-# alias for compatibility
-define modules_file (
-    $source,
-	  $ensure = present,
-	  $m_alias = undef,
-    $mode = 0644, $owner = root, $group = 0
-  )
-{
-  module_file { $name:
-      source => $source,
-      ensure => $ensure,
-      alias => $m_alias,
-      mode => $mode, owner => $owner, group => $group
-      }
-}