Commit graph

10 commits

Author SHA1 Message Date
Micah Anderson
233229435f Merge remote-tracking branch 'sarava/master'
Conflicts:
	manifests/defines/line.pp
	manifests/defines/module_dir.pp
	manifests/defines/module_file.pp
	manifests/init.pp
2011-03-25 00:59:48 -04:00
Jamie McClelland
3ac7106d38 $alias is a metaparam - using it as a variable name results in:
remote: warning: alias is a metaparam; this value will inherit to all contained resources

When running puppet with --verbose
2011-03-24 11:58:06 -04:00
Micah Anderson
63a16ad8c0 Merge remote branch 'immerda/master'
Conflicts:
	lib/puppet/parser/functions/gsub.rb
	lib/puppet/parser/functions/prefix_with.rb
	lib/puppet/parser/functions/sha1.rb
	lib/puppet/parser/functions/slash_escape.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
2010-09-02 19:04:29 -04:00
mh
51e06fd0d2 remove unnecessary fileserver variable (#2460) round II 2010-09-02 18:29:25 -04:00
Jerome Charaoui
e45a5794e7 add ensure and alias parameters to modules_file compatiblity resource and use undef keywork for alias 2010-09-02 18:28:14 -04:00
Jerome Charaoui
d366f079d1 add esnure and alias paramaters to module_file 2010-09-02 18:28:03 -04:00
Jerome Charaoui
ca9b0fecd9 fix whitespace (remove tabs & trailing whitespace) 2010-09-02 18:27:48 -04:00
Jerome Charaoui
1379f6cba1 refactor modules_dir and modules_file to remove plural (deprecated in David Schmitt's version) and adjust module_file to new module_dir structure 2010-09-02 18:26:50 -04:00
David Schmitt
de7690c4e7 RDoc-ify documentation
See http://club.black.co.at/david/puppet/doc/ for a current version of the RDoc
output.
2009-06-09 17:51:10 +02:00
David Schmitt
53d0fde15f 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
2009-05-31 21:14:37 +02:00
Renamed from manifests/defines/modules_file.pp (Browse further)