Commit graph

3664 commits

Author SHA1 Message Date
Nico Schottelius a59fa92246 Merge remote-tracking branch 'jake/__directory_fix' 2013-02-21 22:25:18 +01:00
Jake Guffey a1fb621d19 Merge branch 'master' into __directory_fix 2013-02-20 08:19:46 -05:00
Nico Schottelius 22a8197f6b Merge pull request #163 from jdguffey/__jail_bugfix
_jail bugfix
2013-02-19 14:01:28 -08:00
Jake Guffey a50830dca8 Use $__explorer to get os type 2013-02-19 16:31:06 -05:00
Jake Guffey 9f330e361d Added support for multiple IP addresses
FreeBSD jails support jail_${name}_ip="iface1|addr1, iface2|addr2" format for specifying multiple IP addresses
2013-02-19 16:24:22 -05:00
Jake Guffey 52fdf15a4b Add umask
Some directories were being created 700 and causing problems, added umask 022 to fix this
2013-02-19 15:28:03 -05:00
Jake Guffey 005c94556e Fix to support FreeBSD's stat(1)
Added check for OS type
Added FreeBSD syntax in case of $os=freebsd
2013-02-19 15:23:52 -05:00
Nico Schottelius 177c350747 use self.context, not self.local
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-14 15:45:58 +01:00
Nico Schottelius d1e06504a2 merge back the dependency resolver into pseudo master
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-14 15:28:40 +01:00
Steven Armstrong 06fb7491fa prevent requirements from leaking into autorequired objects and creating circular references
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

Conflicts:
	cdist/test/autorequire/__init__.py
2013-02-14 15:23:04 +01:00
Nico Schottelius cb829ec8d0 introduce MissingObjectIdError
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-05 22:50:22 +01:00
Nico Schottelius 6fbc03076b debugging not easily possible with loss of parameter_path
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-05 22:39:07 +01:00
Nico Schottelius f90f999156 Merge remote-tracking branch 'github/master' 2013-01-31 22:06:33 +01:00
Nico Schottelius 3b430c0d76 Merge pull request #156 from contradict/__git_permissions
__git respects --owner and --group, add --mode
2013-01-31 13:06:09 -08:00
Nico Schottelius b1be1604c6 Merge remote-tracking branch 'github/master' 2013-01-31 22:05:42 +01:00
Nico Schottelius c620c2fa29 Merge pull request #155 from statianzo/directory-owner
Set permissions on existing directory
2013-01-31 13:05:10 -08:00
contradict b772e09d53 Exit with no error if directory absent
Explorers need to handle the case of no directory.
2013-01-30 00:48:08 -08:00
Jason Staten 919707d6f9 Initialize variables to empty string
Set mode, group, etc. to an empty string to ensure that no external
environment variables can leak in.
2013-01-28 10:06:04 -07:00
Nico Schottelius 50208bc537 ++changes recorded
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-01-28 15:11:32 +01:00
Nico Schottelius 55f2ea6b9f Merge branch '__git_permissions' of https://github.com/contradict/cdist 2013-01-28 15:09:04 +01:00
Eivind Uggedal 1b25ef33b9 Slackware os and os_version explorer support. 2013-01-28 08:30:54 -05:00
contradict 3ff7621984 __git respects --owner and --group, add --mode
After checkout, chown and chmod as specified. If already present, but
not possessing correct permissions, run chown and chmod as needed.
2013-01-27 19:53:22 -08:00
Jason Staten fc1a9ed27b directory permission explorers
The group, mode, and owner are now pulled from a explorers. If the
desired value matches the existing value, then no code is executed.

If the recursive flag is set, the permissions are applied every run.
2013-01-24 22:37:52 -07:00
Nico Schottelius 1d933dd5d3 do not need to create directories - git will do this - thanks to Steven
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-01-20 22:02:10 +01:00
Nico Schottelius 61747c4cb7 ++comments
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-01-19 18:24:17 +01:00
Jason Staten f16ac1911d Set permissions on existing directory
Previously, an existing directory would not have its permissions
modified by the __directory type. This change removes exiting early when
$state_is matches $state_should
2013-01-16 20:46:23 -07:00
Nico Schottelius 77e92ceba9 update changes in log file for dependencies based on discussion 2013-01-16 13:13:45 +01:00
Nico Schottelius 474d4f7cb0 Merge branch 'no_extra_output_from_machine_explorer' of https://github.com/contradict/cdist 2013-01-15 09:10:32 +01:00
contradict f41b029ade Eliminiate excess output from machine explorer
command -v emits a string to stdout, silence this since we are only
interested in the return code.
2013-01-12 19:35:09 -08:00
Nico Schottelius acb31b2632 do not push to ethz
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 22:41:20 +01:00
Nico Schottelius fbda50dfb0 ++changes
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 21:16:22 +01:00
Nico Schottelius e03f5d08dd move / correct tests in object and config_install
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 21:14:23 +01:00
Nico Schottelius ef45cd5ce0 fix removal of context alias in config_install
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 21:14:07 +01:00
Nico Schottelius 2732a4ba5c finally finish the dynamic resolver
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 21:10:18 +01:00
Nico Schottelius 527ec0889b remove unneeded fixtures
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 20:53:38 +01:00
Nico Schottelius 4fd27e76a7 support dry_run in stage_run_iterate as well
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 19:37:43 +01:00
Nico Schottelius c270538072 add dry_run option to object_run
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 19:36:00 +01:00
Nico Schottelius eb93d1bebd begin tests for config_install
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 15:33:50 +01:00
Nico Schottelius 369305f376 remove circularreferenceerror, because it is not being used anymore
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 15:33:41 +01:00
Nico Schottelius 8031c77700 fix some tests, break some others :-)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-18 18:21:51 +01:00
Nico Schottelius 4faec43493 cleanup: remove call to old resolver
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-18 17:37:07 +01:00
Nico Schottelius 958d2d336f various cleanups
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-18 17:16:26 +01:00
Nico Schottelius 442dc767dd merge resolver test into object test - because object requirement solving is implemented
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-16 12:55:36 +01:00
Nico Schottelius cd8b3cf68d finish rewrite of dependency resolver
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-16 12:47:13 +01:00
Nico Schottelius 6a8778e595 remove most of the resolver boilerplate, keep the interesting functions
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-14 08:43:52 +01:00
Nico Schottelius 81c92e5cc4 merge all resolver code into cdist_object (to gain the requirement searching code
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-14 08:41:56 +01:00
Nico Schottelius 16340b7d34 report on broken requirements, begin to satisfy requirements
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-14 08:41:17 +01:00
Nico Schottelius 6b6037d9bb todos for a simple resolver
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-13 06:44:55 +01:00
Nico Schottelius 2e81379c18 add very simple solver for dependencies
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-13 06:41:33 +01:00
Nico Schottelius d289cc2d3e +solver that accepts __git behaviour :)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-11 23:13:46 -08:00