Commit graph

145 commits

Author SHA1 Message Date
mh
e90839b248 remove a couple of functions that can now be found in the puppetlabs stdlib 2011-10-08 20:07:53 +02:00
Marcel Haerry
2352be71bf fix class loading so variables are set 2011-08-04 12:47:44 +02:00
mh
5597f5bbcb it is not anymore necessary to have an empty directory as source to purge things 2011-07-15 16:04:48 +02:00
mh
ad2be0a0f8 add hash_merge function 2011-05-17 21:19:58 +02:00
mh
3827e73d67 add array union function 2011-05-17 21:13:10 +02:00
mh
521bad6447 remove delete_lines, as this define is obsolete 2011-04-14 21:10:09 +02:00
Micah Anderson
0961ad453b add Upgrade notice, and additional copyright information. I didn't get everyone in the copyright stanza, so please add yourself if you aren't there! 2011-03-25 13:14:14 -04:00
Micah Anderson
98e0f55b42 fix merge error 2011-03-25 01:23:45 -04:00
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
Silvio Rhatto
46baf4a692 Merge branches 'mayfirst' and 'master' 2011-03-24 15:21:25 -03:00
Silvio Rhatto
f3cf4d3642 Merge branch 'master' of git://git.mayfirst.org/mfpl/puppet-modules/common into mayfirst 2011-03-24 15:19:05 -03: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
intrigeri
ab9bc25704 Remove append_if_no_such_line to sync with shared module. 2011-02-26 00:27:43 +01:00
intrigeri
0b709ed5a7 Merge remote branch 'immerda/master' 2011-02-26 00:25:57 +01:00
Silvio Rhatto
a15e2be608 Removing duplicate module_dir definition 2011-02-14 13:23:54 -02:00
Silvio Rhatto
0b03f41b32 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
2011-02-14 12:11:35 -02:00
mh
7e7eb1d652 rather directly read the file than use the puppet function 2010-12-31 12:53:55 +01:00
mh
b5e2aff27b add a new function called tfile 2010-12-30 14:04:53 +01:00
intrigeri
5d7667b8d0 Merge remote branch 'immerda/master' 2010-12-16 13:58:10 +01:00
mh
7abdda7b1e add array_include function 2010-12-12 13:23:53 +01:00
intrigeri
f61a347d84 Merge remote branch 'immerda/master' 2010-12-11 13:23:23 +01:00
intrigeri
f9b0f065b3 Fix typo in comment. 2010-12-11 13:18:43 +01:00
intrigeri
1f1e5599b7 Merge remote branch 'shared/master'
Conflicts:
	lib/puppet/parser/functions/split.rb
2010-12-11 13:15:33 +01:00
mh
d1abd33530 remove gsub in favor of builtin regsubst 2010-12-09 23:24:13 +01:00
mh
a81984c77e Merge remote branch 'lavamind/master' 2010-11-30 01:26:19 +01:00
intrigeri
001bbc5ff8 Merge remote branch 'cmaisonneuve/master' 2010-11-10 11:56:59 +01:00
mh
ba43064794 add a new function & tests for that function 2010-11-07 13:37:34 -05:00
mh
f8d9e9fd83 enable possibility to set a concatenated file to absent 2010-11-07 13:37:30 -05:00
mh
218c68752e go on uniq strings
Looks like puppet has some internal representation which
is not comparable.
2010-11-07 13:37:27 -05:00
mh
82eed89bcc add a function to do some array work 2010-11-07 13:37:24 -05:00
mh
2dd17923bf add a join function 2010-11-07 13:37:21 -05:00
mh
90a172d01f remove some legacy functions that are now in upstream 2010-11-07 13:37:14 -05:00
Jerome Charaoui
63322aa305 Add multi_source_template function 2010-09-24 14:41:07 -04:00
Jerome Charaoui
a0818f9b36 Use default 'puppet' filebucket instead of arbitrary 'server' for config_file backup 2010-09-21 16:28:57 -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
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