restructure puppet_install

git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@191 f03ff2f1-f02d-0410-970d-b9634babeaa1

diff --git a/manifests/defines/puppet_install.pp b/manifests/defines/puppet_install.pp
index 5f4d62d25336f8747fdf5680cc1ff2fc2122cf00..b80fee2450c511b52905ed02237448aadcdd7cce 100644 (file)
--- a/manifests/defines/puppet_install.pp
+++ b/manifests/defines/puppet_install.pp
@@ -2,6 +2,18 @@
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
 
+# prepare directories to drop various puppet enhancements
+file {
+       [
+               "${rubysitedir}", "${rubysitedir}/puppet",
+               "${rubysitedir}/puppet/provider",
+               "${rubysitedir}/puppet/provider/user",
+               "${rubysitedir}/puppet/provider/group"
+       ]:
+               ensure => directory,
+               mode => 0755, owner => root, group => root,
+}
+
 define puppet::function($source) {
        file {
                "${rubysitedir}/puppet/parser/functions/${name}.rb":
@@ -17,3 +29,11 @@ define puppet::fact($source) {
                        mode => 755, owner => root, group => root,
        }
 }
+
+define puppet::provider($source) {
+       file {
+               "${rubysitedir}/puppet/provider/${name}.rb":
+                       source => $source,
+                       mode => 755, owner => root, group => root,
+       }
+}

diff --git a/manifests/init.pp b/manifests/init.pp
index 86fe2bb6ce3cc22362f6ee028046b8fe8861971d..bdaaee2bd9a077aa130ea4e34df2131dd1e10eb0 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -10,17 +10,12 @@ file {
                source => "puppet://$servername/common/modules/",
                recurse => true, purge => true, force => true,
                mode => 0755, owner => root, group => root;
-       # prepare directories to drop various puppet enhancements
-       [ "$rubysitedir/puppet", "$rubysitedir/facter" ]:
-               ensure => directory, 
-               mode => 0755, owner => root, group => root;
 }
 
 class common::puppetmaster {
-
        file { 
-               "$rubysitedir/puppet/parser":
-                       ensure => directory, 
+               "${rubysitedir}/puppet/parser":
+                       ensure => directory,
                        mode => 0755, owner => root, group => root;
                "$rubysitedir/puppet/parser/functions":
                        source => "puppet://$servername/common/functions/",