diff options
author | David Schmitt <david@schmitt.edv-bus.at> | 2009-05-31 21:14:37 +0200 |
---|---|---|
committer | David Schmitt <david@schmitt.edv-bus.at> | 2009-05-31 21:14:37 +0200 |
commit | 53d0fde15feb30777a6929cada73d5f6e6ceb513 (patch) | |
tree | 1c81f431393991beabff6011a337dce2d0d76931 /manifests/init.pp | |
parent | 9a2c68367f8ac75ce52e315253d28f6710a80702 (diff) | |
download | puppet-common-53d0fde15feb30777a6929cada73d5f6e6ceb513.tar.gz puppet-common-53d0fde15feb30777a6929cada73d5f6e6ceb513.tar.bz2 |
Major cleanup of the common module
* improve documentation on all defines
* rename modules_dir to module_dir and modules_file to module_file
* create $module_dir_path to achieve DRY-ness
* silence the lsb_release stuff
* improve concatenated_file to use an intermediate file, improving reliability
and decoupling the updateing from notifying our peers.
* remove serveral functions that were moved to puppet proper:
- sha1 => sha1
- gsub,substitute,slash_escape => regsubst
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index e0feaaf..f7298e3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -2,19 +2,24 @@ # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. -file { - # Module programmers can use /var/lib/puppet/modules/$modulename to save - # module-local data, e.g. for constructing config files - "/var/lib/puppet/modules": - ensure => directory, - source => "puppet:///common/modules/", - ignore => ".ignore", - recurse => true, purge => true, force => true, - mode => 0755, owner => root, group => 0; -} - import "defines/*.pp" import "classes/*.pp" +module_dir { [ 'common' ]: } + +file { + # Module programmers can use /var/lib/puppet/modules/$modulename to save + # module-local data, e.g. for constructing config files. See module_dir + # for details + "/var/lib/puppet/modules": + ensure => directory, + source => "puppet:///common/modules", + ignore => ".ignore", + recurse => true, purge => true, force => true, + mode => 0755, owner => root, group => 0; +} + # common packages class pkg::openssl { package { openssl: ensure => installed } } +class pkg::rsync { package { rsync: ensure => installed } } + |