Commit graph

103 commits

Author SHA1 Message Date
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
mh
836316955a remove unnecessary fileserver variable (#2460) 2010-09-02 18:29:17 -04:00
mh
e5de903a22 escaping 2010-09-02 18:29:12 -04:00
mh
8904d70221 cleanup escaping stuff 2010-09-02 18:29:06 -04:00
mh
51d64164a9 Revert "remove escaping"
This reverts commit 7cc9d114afc9d5c807a7ee30bff7aaba865aded3.
2010-09-02 18:28:56 -04:00
mh
619f43a1bc Revert "remove escaping"
This reverts commit 40e3048d060f10105ae9dff524d5fa7901523a3e.
2010-09-02 18:28:49 -04:00
mh
533ec99736 remove escaping 2010-09-02 18:28:42 -04:00
mh
506be3f70f remove escaping 2010-09-02 18:28:35 -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
mh
bd774cd232 quote var to be safer 2010-09-02 18:28:09 -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
Jerome Charaoui
109311524e document changes in module_dir usage 2010-09-02 18:17:54 -04:00
Marcel Haerry
f3dde9f52a refactoring the last part of moduledirs 2010-09-02 18:17:35 -04:00
Jerome Charaoui
fcb2b08309 concatenated_file: update define to latest from David Schmitt's common module 2010-09-02 18:17:13 -04:00
Jerome Charaoui
9f33629630 add $module_dir_path in modules_dir define for compatibility with David Schmitt's module 2010-09-02 18:15:31 -04:00
mh
9a70828ea0 set sed and grep relative 2010-09-02 18:15:24 -04:00
mh
b4ce2e8769 make the removal of line safer 2010-09-02 18:14:15 -04:00
mh
75f88ffda0 add alias for compatibility 2010-09-02 18:14:07 -04:00
mh
d39201f8a2 make the define much easier 2010-09-02 18:14:02 -04:00
Andreas
2a679f8fa0 remove link if absent 2010-09-02 18:13:55 -04:00
Andreas
72dcd72362 generate a link 2010-09-02 18:13:49 -04:00
mh
1b4f833b19 remove extra slash 2010-09-02 18:13:43 -04:00
mh
1a6eaf9c2e fix missing urls to 0.25.x 2010-09-02 18:13:36 -04:00
mh
acf0532464 fix missing urls to 0.25.x 2010-09-02 18:13:23 -04:00
mh
d75dcc86f8 recursivly updating file path to new 0.25 style 2010-09-02 18:12:49 -04:00
mh
36c3eecba3 remove unnecessary import 2010-09-02 18:11:59 -04:00
mh
97e15ea5a8 move plugin directory to fit new 0.25 style 2010-09-02 18:11:43 -04:00
mh
37b37ae82f whitespace 2010-09-02 18:10:52 -04:00
mh
91ea4d11ae fixing typo 2010-09-02 18:10:44 -04:00
mh
61d767b561 added a strlength function to get the length of a string into puppet 2010-09-02 18:10:33 -04:00
mh
49b127b80a we don't require any of these execs, so we don't need them 2010-09-02 18:10:24 -04:00
mh
69a63c5767 fixed quoting 2010-09-02 18:09:44 -04:00
pietro
76b0a31a76 Revert "fix source path."
This reverts commit 1fa98d6183.
2009-11-27 18:58:39 -08:00
pietro
6bd12511bb Revert "fix path to source file."
This reverts commit 314af5320f.
2009-11-27 18:58:20 -08:00
pietro
1fa98d6183 fix source path. 2009-11-27 18:35:46 -08:00
pietro
314af5320f fix path to source file. 2009-11-27 18:23:13 -08:00
Micah Anderson
3ff12051c8 move plugin directory to fit new 0.25.x style and update file paths accordingly 2009-11-23 11:54:04 -05:00
Micah Anderson
8a38942507 fix indentation in line.pp example configuration snippet 2009-09-03 13:57:47 -04:00
Micah Anderson
89be6dc2f6 remove 'backup => server' from config_file, as there is no such thing
as 'server'. This didn't work as expected because of this error, and
in some situations it caused problems (such as when ever file in a
directory is considered a config file, such is the case with
apt.conf.d )
2009-09-03 13:54:28 -04:00
David Schmitt
6e9ef2d08e Add append_if_no_such_line compatablity define 2009-07-13 10:52:34 +02: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
c65920d6b8 blob!=raw, should check wget better ;-) 2009-06-02 22:32:30 +02:00
David Schmitt
7cd63a177c Reenable gsub, since regsubst is no proper replacement 2009-06-02 19:22:03 +02:00
David Schmitt
b7ca00eb83 always run concatenate command
Now that this doesn't case unnecessary updates in the system, running the
concatenation every time imrpoves robustness in the face of state damages and
other non-notifying content changes.

Also, tone down the exec to info level to keep the log clean.
2009-06-02 14:16:38 +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
David Schmitt
9a2c68367f create a common class to install openssl 2008-09-15 15:37:34 +02:00
David Schmitt
3a65dd8535 improve documentation and function naming 2008-08-25 16:45:29 +02:00