Commit graph

576 commits

Author SHA1 Message Date
Daniel Heule
a94de8fae4 Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value
Conflicts:
	cdist/conf/type/__key_value/gencode-remote
2014-03-12 20:07:27 +01:00
Steven Armstrong
5ec617fa3e ignore trailing slashes for comparison of source
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 22:16:08 +01:00
Steven Armstrong
301b4e18ff either to it all, or fail; echo and cat suck, printf ftw!
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 21:07:20 +01:00
Daniel Heule
38c3d551ba bugfix, if file was absent and type is now tested on openwrt 2014-03-11 21:05:31 +01:00
Steven Armstrong
75c203a1f0 handle existing symlink but wrong source
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 20:48:47 +01:00
Nico Schottelius
0a98abbffa add messaging support for __key_value
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-11 15:39:08 +01:00
og
3d5706d3cc escaped some variables in the gencode-remote output 2014-03-08 17:18:19 -07:00
og
074938c697 . 2014-03-03 15:13:57 -07:00
og
3fffb93150 OpenBSD pkg utils does not return properly, so we have to verify success by looking at the list of installed packages after the present/absent actions 2014-03-03 14:59:50 -07:00
Nico Schottelius
f06ff4bc3a Merge branch 'master' of https://github.com/ghettosh/cdist 2014-03-03 07:40:54 +01:00
og
ef1f9bf633 updated documentation to reflect new parameter 2014-03-02 17:44:22 -07:00
og
6a455be63a openbsd and freebsd both use the 'passwd' database 2014-03-02 17:34:36 -07:00
og
5cbdf981c0 adding pkg_path parameter to be explicitly set, this is important for using -current, as os_version always parses to a release version (e.g. 5.5) but the path that mirrors have is /snapshots/ 2014-03-02 17:32:14 -07:00
og
1c0d74f7db openbsd stat works the same way that freebsd's does 2014-03-02 17:18:25 -07:00
Daniel Heule
fa55cd7d3b ups, typo ... thx to steven 2014-02-27 21:08:45 +01:00
Daniel Heule
727c918f67 work around a bug in bash3, now tested with dash, bash, busybox 2014-02-27 17:04:23 +01:00
Daniel Heule
0198b99eb5 corrected some debug codesnips 2014-02-27 15:47:19 +01:00
Daniel Heule
8d80e52de9 implemented some suggestions from steven 2014-02-27 14:45:19 +01:00
Daniel Heule
d1c55a9acb Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value 2014-02-25 11:41:18 +01:00
Daniel Heule
225752bd42 updated the man page .... 2014-02-25 11:35:14 +01:00
Nico Schottelius
8e68da055c Merge branch 'docfix-ssh-22' of https://github.com/acatton/cdist 2014-02-25 09:51:43 +01:00
Daniel Heule
820ed5ae0c added option comment_line to prefix key value with a comment line 2014-02-24 23:27:42 +01:00
Daniel Heule
205e256ef6 rewrite of __key_value, now support nerarly every value 2014-02-24 21:42:45 +01:00
Nico Schottelius
a126bd955f use while read -> avoids ifs problem
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-24 18:06:15 +01:00
Nico Schottelius
ce0f779664 include the owner into the object_id for line
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-24 16:00:12 +01:00
Antoine Catton
4e535b6b8b Docfix: ssh service listen on port 22 2014-02-23 20:22:06 -07:00
Steven Armstrong
95f38d9d44 remove no longer supported parameter --comment
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 01:12:41 +01:00
Steven Armstrong
16a829d3eb manage individual keys instead of block of text
also fixes #251

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 01:10:44 +01:00
Steven Armstrong
2fdff153d6 dont fail if result is empty file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 00:57:00 +01:00
Steven Armstrong
68c1bf6633 preserve ownership and permissions of existing file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 00:56:54 +01:00
Nico Schottelius
13e8e53941 Merge branch 'master' into type__rbenv 2014-02-14 20:51:29 +01:00
Nico Schottelius
f461a5073c pass owner/group/mode to __directory as well
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:44:51 +01:00
Nico Schottelius
95b1ac0706 update rbenv type to cdist 3.0 style
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:34:24 +01:00
Nico Schottelius
490bad7b26 Merge branch 'master' into type__rbenv 2014-02-14 20:13:18 +01:00
Nico Schottelius
ab8ae75837 Merge branch 'issue/297' of git://github.com/asteven/cdist 2014-02-14 01:48:03 +01:00
Steven Armstrong
f82a6224f2 use positional arguments in favour of keyword arguments for backwards compatibility with older python
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-13 21:05:37 +01:00
Steven Armstrong
46459053f4 use posix -L in favour of longopts
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-13 21:02:18 +01:00
Daniel Heule
e8f5d4c340 some new explorers wich are handy if you must tune for example sap or
oracle to the systemtype, cpu cores and/or physical memory
2014-02-13 15:38:35 +01:00
Nico Schottelius
a2c2cc139a adjust default branch hint
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-13 10:33:24 +01:00
Nico Schottelius
2ceced593b Merge branch 'bugfix_state_params' of git://github.com/dheule/cdist 2014-02-12 17:04:30 +01:00
Nico Schottelius
01a3f7c0b7 Merge branch 'bugfix_override_and_order' of https://github.com/dheule/cdist 2014-02-12 16:56:30 +01:00
Nico Schottelius
23f85118f5 add a hint about unsupported os
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-12 16:42:02 +01:00
Daniel Heule
cfbc68aa11 bugfix if both override and order is specified 2014-02-12 10:31:46 +01:00
Nico Schottelius
4031209f7b Merge branch 'bugfix_issue_102' of git://github.com/dheule/cdist 2014-02-11 22:30:24 +01:00
Daniel Heule
6a5f908269 yep, dryrun option has now a unittest, was hard to work out ... 2014-02-11 21:17:19 +01:00
Nico Schottelius
dae43b4489 Merge branch 'feature_unittest_CDIST_ORDER_DEPENDENCY' of https://github.com/dheule/cdist 2014-02-11 15:31:56 +01:00
Daniel Heule
e29255b9f2 add an unittest for CDIST_ORDER_DEPENDENCY 2014-02-11 15:20:26 +01:00
Daniel Heule
a5426ff4b5 completed copyright infos ... 2014-02-09 17:43:31 +01:00
Daniel Heule
2dd2f5593f bugfixes for issue 161 and FIXME: also check that there is no object ID
when type is singleton?
2014-02-09 17:10:43 +01:00
Daniel Heule
f3172fda95 2 more types for issue 131 2014-02-08 22:06:27 +01:00
Daniel Heule
423001b702 Make state parameter optional for all types, fixes #131 2014-02-08 21:48:51 +01:00
Daniel Heule
60c53e213c testcases emulator.OverrideTestCase, with some minor bugfixes to make
test work as expected ...
2014-02-07 14:24:12 +01:00
Daniel Heule
f163b32720 first try of a test 2014-02-07 13:28:22 +01:00
Daniel Heule
717e21da6c initial update for override unittests 2014-02-07 00:28:02 +01:00
Nico Schottelius
1be3ea4362 Merge branch 'origin/feature_object_override' of git://github.com/dheule/cdist 2014-02-06 16:32:29 +01:00
Daniel Heule
52e2017d8f CDIST_ALLOW_OVERRIDE -> CDIST_OVERRIDE as requested by nico 2014-02-06 16:03:07 +01:00
Nico Schottelius
41266a1946 Merge branch 'feature__cdist_autodep_try2' of git://github.com/dheule/cdist 2014-02-06 15:48:45 +01:00
Daniel Heule
51afca5336 Implement lastest suggestions from nico, rename ENV Variable to
CDIST_ORDER_DEPENDENCY
2014-02-06 15:26:17 +01:00
Daniel Heule
2b5929c881 Merge branch 'master' of https://github.com/telmich/cdist into feature__cdist_autodep_try2
Conflicts:
	docs/man/man7/cdist-manifest.text
2014-02-06 15:10:34 +01:00
Nico Schottelius
4264237bfe Merge branch 'bugfix__types_default_values' of git://github.com/dheule/cdist 2014-02-06 11:26:35 +01:00
Nico Schottelius
294285c164 import __ccollect_source type
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-06 00:08:40 +01:00
Nico Schottelius
8afb752908 Merge branch 'issue/283' of git://github.com/asteven/cdist 2014-02-05 23:13:59 +01:00
Steven Armstrong
6f0459f3c5 remove legacy FIXME
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-05 21:18:47 +01:00
Steven Armstrong
7686a5ac5e be nice to them users
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-05 21:17:15 +01:00
Steven Armstrong
14a112fcce /wget/curl/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-05 21:12:22 +01:00
Nico Schottelius
34f2f7f038 setting up CDIST_ALLOW_OVERRIDE to any value is ok - do not depend on true/yes/ja
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-05 21:09:24 +01:00
Steven Armstrong
f928072f74 let the user decide what is sane and what not
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-05 21:07:33 +01:00
Steven Armstrong
03ce5a2828 import __apt_* types from private repo
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-04 12:24:10 +01:00
Daniel Heule
3c52710763 little changes for using default parameters correctly 2014-02-03 21:43:39 +01:00
Steven Armstrong
3a57367e7e bugfix: make type actually work with --state absent
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-01 22:46:36 +01:00
Nico Schottelius
a9dd040164 Merge branch 'feature_object_override' of git://github.com/dheule/cdist 2014-01-31 21:47:23 +01:00
Daniel Heule
5fbac8d0ba forgot the : after the else ... 2014-01-31 17:59:56 +01:00
Daniel Heule
197fabf40a added some ideas from asteven and a bit more description about the order
in the manpage
2014-01-31 17:56:55 +01:00
Nico Schottelius
228ed4dbd2 fix typos in __debconf_set_selections
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-29 23:19:07 +01:00
Nico Schottelius
16d51b3cf1 backport ignoring install types in config mode from install_integration branch
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-29 22:40:59 +01:00
Nico Schottelius
c3508945ca Merge branch 'jailfix' of https://github.com/jdguffey/cdist 2014-01-27 19:37:23 +01:00
Jake Guffey
723be34bca Fixed typo
Was assigning jaildir=$object/parameter/name, fixed to $object/parameter/jaildir
2014-01-27 13:22:03 -05:00
Daniel Heule
4ef55ef13f allow object overrides with CDIST_ALLOW_OVERRIDE=true 2014-01-27 16:19:01 +01:00
Nico Schottelius
9049a1421c support --file - in __debconf_set_selections
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-27 14:17:51 +01:00
Nico Schottelius
d0ef6b6583 Merge branch 'issue/271' of git://github.com/asteven/cdist 2014-01-22 22:05:55 +01:00
Steven Armstrong
7a0b3cd7b7 python-software-properties still needed for older ubuntu versions
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-22 21:21:34 +01:00
Daniel Heule
b75481a4d4 parameter default handling in __key_value type corrected 2014-01-21 23:18:10 +01:00
Daniel Heule
360b42e892 parameter default handling in __zypper_repo type corrected 2014-01-21 22:57:06 +01:00
Daniel Heule
08b8270739 parameter default handling in __zypper_service type corrected 2014-01-21 22:45:35 +01:00
Daniel Heule
02c3fe4988 parameter default handling in __qemu_img type corrected 2014-01-21 22:33:10 +01:00
Daniel Heule
92e67182a6 parameter default handling in __cdist type corrected 2014-01-21 22:24:35 +01:00
Nico Schottelius
51c9662475 DO NOT USE ECHO WHEN SOMETHING MAY CONTAIN A B-A-C-K-S-L-A-S-H
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-21 16:41:34 +01:00
Daniel Heule
64f4cff3cb Shell selection support via ENV
CDIST_LOCAL_SHELL for local scripts
CDIST_REMOTE_SHELL for remote scripts
2014-01-20 20:30:37 +01:00
Nico Schottelius
b6bae508a8 use hostnamectl, if available, else use /etc/hostname and hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:26:22 +01:00
Nico Schottelius
8d5357107b use uname -n in hostname explorer
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:07:31 +01:00
Steven Armstrong
aee97cffd6 install proper packages
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-20 14:01:29 +01:00
Nico Schottelius
cd6abf379a allow hostname -f to fail and return empty output
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:52:49 +01:00
Nico Schottelius
9123940255 port selection of first part into gencode-remote
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:51:48 +01:00
Nico Schottelius
29d4f910bc do not change parameters
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:50:42 +01:00
Nico Schottelius
5279b7239c import __hostname - Thanks, Steven!
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:47:45 +01:00
Nico Schottelius
ac0c88fe9f remove some old typos and omit type details that follow anyway
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:28:45 +01:00
Nico Schottelius
ce73cef457 explain that a requirement caused the error, otherwise you search until you die
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:22:48 +01:00
Daniel Heule
61aec12ba1 Try2 to make cdist honor the manifest order,
this implementation has some more lines of code,
but no collision with the require variable.
2014-01-18 19:23:21 +01:00
Nico Schottelius
b0ebc277d6 Merge branch 'issue/260' of git://github.com/asteven/cdist 2014-01-18 15:57:02 +01:00
Nico Schottelius
63af60a0d9 Merge branch 'issue/261' of git://github.com/asteven/cdist 2014-01-18 15:54:38 +01:00