diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-14 12:11:35 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-14 12:11:35 -0200 |
commit | 0b03f41b32e8423bbbfa3c8a6b02dbf17c04f4c1 (patch) | |
tree | c5d7863c96377394b8559fbd5c7777fb32b6fda1 /manifests/init.pp | |
parent | e0080adb1ca115ee98bf97c9cfb91fccbfeddaac (diff) | |
parent | a81984c77ed1efb56e978d8b5050b6c3ec409d80 (diff) | |
download | puppet-common-0b03f41b32e8423bbbfa3c8a6b02dbf17c04f4c1.tar.gz puppet-common-0b03f41b32e8423bbbfa3c8a6b02dbf17c04f4c1.tar.bz2 |
Merge branch 'master' of git://labs.riseup.net/shared-common
Conflicts:
lib/puppet/parser/functions/gsub.rb
lib/puppet/parser/functions/prefix_with.rb
lib/puppet/parser/functions/slash_escape.rb
lib/puppet/parser/functions/split.rb
lib/puppet/parser/functions/substitute.rb
manifests/classes/lsb_release.pp
manifests/defines/concatenated_file.pp
manifests/defines/config_file.pp
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/defines/module_file.pp
manifests/defines/replace.pp
manifests/init.pp
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index f767030..3770897 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,23 +3,3 @@ # See LICENSE for the full license granted to you. 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://$server/modules/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 } } - |