diff options
| -rw-r--r-- | manifests/defines/puppet_install.pp | 41 | ||||
| -rw-r--r-- | manifests/init.pp | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | plugins/puppet/parser/functions/basename.rb (renamed from files/functions/basename.rb) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | plugins/puppet/parser/functions/dirname.rb (renamed from files/functions/dirname.rb) | 0 | ||||
| -rw-r--r-- | plugins/puppet/parser/functions/gsub.rb (renamed from files/functions/gsub.rb) | 0 | ||||
| -rw-r--r-- | plugins/puppet/parser/functions/re_escape.rb (renamed from files/functions/re_escape.rb) | 0 | ||||
| -rw-r--r-- | plugins/puppet/parser/functions/sha1.rb (renamed from files/functions/sha1.rb) | 0 | ||||
| -rw-r--r-- | plugins/puppet/parser/functions/slash_escape.rb (renamed from files/functions/slash_escape.rb) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | plugins/puppet/parser/functions/split.rb (renamed from files/functions/split.rb) | 0 |
9 files changed, 0 insertions, 53 deletions
diff --git a/manifests/defines/puppet_install.pp b/manifests/defines/puppet_install.pp deleted file mode 100644 index dbc9848..0000000 --- a/manifests/defines/puppet_install.pp +++ /dev/null @@ -1,41 +0,0 @@ -# puppet_install.pp -- install puppet functions and facter facts -# 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}/facter", - "${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": - source => $source, - mode => 755, owner => root, group => root, - } -} - -define puppet::fact($source) { - file { - "${rubysitedir}/facter/${name}.rb": - source => $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 bdaaee2..577b0c6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -12,17 +12,5 @@ file { mode => 0755, owner => root, group => root; } -class common::puppetmaster { - file { - "${rubysitedir}/puppet/parser": - ensure => directory, - mode => 0755, owner => root, group => root; - "$rubysitedir/puppet/parser/functions": - source => "puppet://$servername/common/functions/", - recurse => true, purge => true, - mode => 0755, owner => root, group => root; - } -} - import "defines/*.pp" import "classes/*.pp" diff --git a/files/functions/basename.rb b/plugins/puppet/parser/functions/basename.rb index 14f0ca0..14f0ca0 100755..100644 --- a/files/functions/basename.rb +++ b/plugins/puppet/parser/functions/basename.rb diff --git a/files/functions/dirname.rb b/plugins/puppet/parser/functions/dirname.rb index 3f784ac..3f784ac 100755..100644 --- a/files/functions/dirname.rb +++ b/plugins/puppet/parser/functions/dirname.rb diff --git a/files/functions/gsub.rb b/plugins/puppet/parser/functions/gsub.rb index 371820f..371820f 100644 --- a/files/functions/gsub.rb +++ b/plugins/puppet/parser/functions/gsub.rb diff --git a/files/functions/re_escape.rb b/plugins/puppet/parser/functions/re_escape.rb index 6e5904b..6e5904b 100644 --- a/files/functions/re_escape.rb +++ b/plugins/puppet/parser/functions/re_escape.rb diff --git a/files/functions/sha1.rb b/plugins/puppet/parser/functions/sha1.rb index b5aa813..b5aa813 100644 --- a/files/functions/sha1.rb +++ b/plugins/puppet/parser/functions/sha1.rb diff --git a/files/functions/slash_escape.rb b/plugins/puppet/parser/functions/slash_escape.rb index 04d3b95..04d3b95 100644 --- a/files/functions/slash_escape.rb +++ b/plugins/puppet/parser/functions/slash_escape.rb diff --git a/files/functions/split.rb b/plugins/puppet/parser/functions/split.rb index d08a40b..d08a40b 100755..100644 --- a/files/functions/split.rb +++ b/plugins/puppet/parser/functions/split.rb |