Commit graph

114 commits

Author SHA1 Message Date
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
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
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
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
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
f8d9e9fd83 enable possibility to set a concatenated file to absent 2010-11-07 13:37:30 -05: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
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
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
Silvio Rhatto
e0080adb1c Reverting last changes: workaround doesn't work 2009-12-27 23:48:06 -02:00
Silvio Rhatto
0411a1b964 Workaround for puppet issue #2786 (3) 2009-12-27 23:39:46 -02:00
Silvio Rhatto
ee51719e23 Workaround for puppet issue #2786 (2) 2009-12-27 23:17:23 -02:00
Silvio Rhatto
3f3d08d12a Workaround for puppet issue #2786 2009-12-27 23:13:42 -02:00
Silvio Rhatto
a25d1e44c2 Adding delete_lines 2009-12-25 22:33:24 -02:00