Commit Graph

766 Commits

Author SHA1 Message Date
Nico Schottelius 339167c23c catch some errors
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-09-14 13:51:13 +02:00
Nico Schottelius 3244cfae85 Merge branch 'master' of https://github.com/jimenezrick/cdist into preos 2014-09-14 13:47:53 +02:00
Ricardo Catalinas Jiménez 3223a38889 Fix typo in cdistmarker doc 2014-09-13 23:31:38 +01:00
Jake Guffey 37a8b4af2b Minor fixes
Fixed pkgng_exists explorer (can't reference $__global)
Fixed logic in __package/pkgng_freebsd/gencode-remote
   Wasn't installing package if it already exists, but after explorer execution
2014-09-10 15:54:13 -04:00
Nico Schottelius 9ecbf9f1cc Merge branch 'master' into preos 2014-09-10 17:47:24 +02:00
Jake Guffey e87b26f2de Introduce __package_pkgng_freebsd type
Create __package_pkgng_freebsd type to handle package management via pkg-ng
Add requirement generation in __package/manifest
Add explorer inside __package to find if pkg-ng is installed on the target
2014-09-09 17:10:32 -04:00
Steven Armstrong a956583169 Merge remote-tracking branch 'telmich/master' 2014-08-20 13:03:35 +02:00
Nico Schottelius 249455f347 also support archlinux in __locale
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-08-17 12:03:46 +02:00
Steven Armstrong 3dbe375837 no need to double escape a trailing $; $ by itself is not special in any way
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-07-28 15:05:45 +02:00
Steven Armstrong fff5e48266 /index/match/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-07-28 15:04:48 +02:00
Nico Schottelius c6ad2e60b3 remove obsolete todos ... people believe they still need to be fixed!
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-26 17:11:35 +02:00
Nico Schottelius 37451590b1 add reset to iptables init.d script
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-26 15:24:42 +02:00
Daniel Heule 614c73e10e correct date of c 2014-06-25 00:18:41 +02:00
Daniel Heule ab6502c9df correct match if / is the last char of a url and the end of the line 2014-06-25 00:16:40 +02:00
Manuel Hutter 981f8068d2 code diet on "memory" 2014-06-21 14:24:10 +02:00
Manuel Hutter e727824964 `cat` and pipe diet 2014-06-18 10:19:21 +02:00
Manuel Hutter c36fba4b99 Fixed global explorers on OSX 2014-06-17 19:04:22 +02:00
Nico Schottelius d294a2c28e +"
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-16 08:02:41 +02:00
Nico Schottelius 6a2f2352be new type: __ssh_dot_ssh
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-16 07:57:10 +02:00
Nico Schottelius a1d78384f9 Merge branch 'preos' into 4.0-pre-not-stable 2014-06-13 16:29:29 +02:00
Markus Koller 3d82a0d25c Set hostname in preos 2014-06-13 14:56:24 +02:00
Nico Schottelius 5f9eef3bbb Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable 2014-06-13 13:34:42 +02:00
Nico Schottelius 9bf2d58a8f Merge branch 'master' into install_integration 2014-06-13 13:34:31 +02:00
Nico Schottelius 3b4258c34e Merge branch 'master' into preos 2014-06-13 13:33:28 +02:00
Nico Schottelius efb2c4a163 Merge branch 'fix-file-stat-osx' of https://github.com/mhutter/cdist 2014-06-11 00:35:01 +02:00
Nico Schottelius 3592a0c6dd +suse support in __locale and __hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-10 23:50:53 +02:00
Nico Schottelius 17504975a6 suse support for __timezone
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-10 23:15:21 +02:00
Manuel Hutter 8a70343e2c Fixed wrong mode format for stat on OSX. 2014-06-10 19:48:02 +02:00
Manuel Hutter 90acfc3952 Fixed stat on OSX 2014-06-10 19:19:26 +02:00
Daniel Heule 9bac6da6c9 bugfix emerge type for slotted packages 2014-06-09 15:42:17 +02:00
Nico Schottelius bbd451433f add --url support for __package_yum
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-05-20 07:43:11 +02:00
Nico Schottelius ae53b8e381 Merge branch 'bugfix__zypper' of https://github.com/dheule/cdist 2014-05-05 22:32:54 +02:00
Nico Schottelius 47ba46400c Merge pull request #325 from jdguffey/__jail_messaging
Added messaging support for __jail type
2014-05-04 08:52:48 +02:00
Nico Schottelius 1bb897f9a2 Merge pull request #312 from asteven/issue/312
all files cdist creates should allways end with newline
2014-05-04 08:50:30 +02:00
Nico Schottelius 1bfa281cec Merge pull request #334 from dheule/bugfix__explorer_interfaces
bugfix the list of interfaces
2014-05-04 08:43:12 +02:00
Nico Schottelius bfbc621010 ++releasedate
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-04-29 18:10:50 +02:00
Daniel Heule 3710557c62 bugfix the list of interfaces 2014-04-29 12:57:46 +02:00
Daniel Heule 5a647ec763 Bugfix to auto import pgp keys for new repos, so we can add repos with new keys 2014-04-29 11:49:43 +02:00
Nico Schottelius 9127e06109 CentOS support for __hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-04-25 01:48:58 +02:00
Steven Armstrong 8a4cc56266 ensure all files we create end with a single newline
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-04-22 11:04:02 +02:00
Nico Schottelius f9783f5f77 Merge branch 'bugfix_issue_327' of https://github.com/dheule/cdist 2014-04-15 01:27:50 +02:00
Daniel Heule c5152b75f2 rename parameter service_uri to uri as requested 2014-04-14 19:18:16 +02:00
Daniel Heule 831acd16c6 rename parameter repo_uri to uri as requested by nico 2014-04-14 19:14:29 +02:00
Steven Armstrong 40e517f50c new type __yum_repo to manage yum repositories
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-04-14 12:46:17 +02:00
Jake Guffey f7a6377b74 Updated man page
Included MESSAGES section
2014-04-07 09:44:28 -04:00
Jake Guffey d12daf10c4 Added messaging support for __jail type
prints start/stop/create/delete/onboot to $__messages_out
2014-04-07 09:41:03 -04:00
Nico Schottelius 9eec4e22fb Merge branch 'bugfix_type__key_value' of https://github.com/dheule/cdist 2014-04-06 20:22:23 +02:00
Nico Schottelius ad7977e51b ++;;
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 23:58:58 +02:00
Nico Schottelius 9ad7e05502 ++;;
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 23:58:45 +02:00
Nico Schottelius 84159d18e0 Merge branch 'master' into 4.0-pre-not-stable 2014-03-31 22:16:30 +02:00
Nico Schottelius 2955ef4344 cleanups
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 21:22:29 +02:00
Nico Schottelius b7f8b5e339 catch unsupported state cases in __dog_vdi und __qemu_img
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 21:22:15 +02:00
Nico Schottelius b22b581b67 first version of __dog_vdi
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 14:26:14 +02:00
Nico Schottelius ff8f7ac287 add copied version __dog_vdi from __qemu_img
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-30 13:09:38 +02:00
Daniel Heule 50316902e3 renamed ll to lastline, hope its now clear what the var is for .. 2014-03-26 13:58:29 +01:00
Nico Schottelius f3c3f454d3 Merge branch 'feature_new_explorers' of https://github.com/dheule/cdist 2014-03-26 13:06:33 +01:00
Daniel Heule 7b6102750e as requested, replace space with _ 2014-03-26 11:57:15 +01:00
Nico Schottelius 2c6e3e0e96 Merge branch 'jailfix' of https://github.com/jdguffey/cdist 2014-03-26 11:19:09 +01:00
Nico Schottelius 73b54aab09 Merge branch 'issue/321' of https://github.com/asteven/cdist 2014-03-26 11:15:36 +01:00
Nico Schottelius 58d57bc532 Merge branch 'enhancement-package-pkg-openbsd' of https://github.com/ghettosh/cdist 2014-03-26 11:06:22 +01:00
Nico Schottelius 6e81bbc54b Merge branch 'issue/315' of https://github.com/asteven/cdist 2014-03-26 10:59:50 +01:00
Daniel Heule bae472eb33 fixed some typos in the man page 2014-03-26 10:41:00 +01:00
Jake Guffey c31278bcd0 Fix __jail explorers
Only fixed gencode*, manifest in PR #279, fixed explorers here
2014-03-25 12:50:27 -04:00
Daniel Heule b7fb973fa5 bugfix for whitespace stripping, its no more simple 2014-03-21 09:35:47 +01:00
Daniel Heule 807e2902ea Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value
New functionality for remote __object is needed
2014-03-21 09:23:44 +01:00
Daniel Heule f36dc11601 forgot myself to the headers .. 2014-03-20 17:22:07 +01:00
Daniel Heule 5ef27191fc implementing the $__object and $__object_id on the local and remote
execution call, to allow read access to parameter files
2014-03-20 13:52:12 +01:00
Nico Schottelius 2b03ccd776 changes for 3.1.0
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-19 18:57:11 +01:00
Nico Schottelius bcca8a637b Merge branch 'master' into type__rbenv 2014-03-13 10:30:48 +01:00
Daniel Heule 619076bd2d corrected a small relict in example 2014-03-12 20:16:33 +01:00
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 ff897bc904 Merge branch 'master' into 4.0-pre-not-stable 2014-02-14 20:58:19 +01:00
Nico Schottelius 44f910d199 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-14 20:52:48 +01:00
Nico Schottelius 2734e5069e Merge branch '3.0' into 4.0-pre-not-stable 2014-02-14 20:52:36 +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
Steven Armstrong 17472bc17b Merge remote-tracking branch 'telmich/preos' into preos
Conflicts:
	cdist/preos.py
2014-02-12 22:44:31 +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 32eee3b8e9 Merge branch 'master' into 4.0-pre-not-stable 2014-02-12 16:47:10 +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
Nico Schottelius 1f39d50285 Merge branch 'feature_unittest_CDIST_ORDER_DEPENDENCY' of https://github.com/dheule/cdist into 4.0-pre-not-stable 2014-02-11 15:31:48 +01:00
Daniel Heule e29255b9f2 add an unittest for CDIST_ORDER_DEPENDENCY 2014-02-11 15:20:26 +01:00
Nico Schottelius 97b2335323 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-10 21:40:22 +01:00
Nico Schottelius 4efe8553da run apt-get clean before creating preos
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-10 21:40:11 +01:00
Nico Schottelius 3cc49460a3 Merge branch 'master' into preos 2014-02-10 21:34:54 +01:00
Nico Schottelius 219f3a99bf Merge branch 'master' into install_integration 2014-02-10 21:34:35 +01:00
Nico Schottelius 42b240f496 Merge branch 'master' into 4.0-pre-not-stable 2014-02-10 14:56:19 +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
Nico Schottelius 03f99a0e55 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-08 00:32:39 +01:00
Nico Schottelius 79973d1582 Merge branch 'master' into install_integration
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
2014-02-08 00:32:28 +01:00
Nico Schottelius acddd14ce1 Merge branch 'master' into preos 2014-02-08 00:31:30 +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 ee5731fc96 add __ccollect_source type
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-06 00:08:02 +01:00
Nico Schottelius 5389d71905 Merge branch 'master' into 4.0-pre-not-stable
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
	docs/changelog
2014-02-05 23:22:04 +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