Commit graph

194 commits

Author SHA1 Message Date
Nico Schottelius
68d4bcbcb4 begin to fix syntax errors of merge
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-03 15:05:43 +02:00
Nico Schottelius
3d73cd2fd3 better debugging for wrong type, fix emulator tests, fixes #176
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-27 16:36:20 +02:00
Tyler Akins
1485381340 Fixing apt_ppa type - can't use double equals with dash 2013-05-26 15:54:28 -05:00
Nico Schottelius
51c8687455 re-add object_prepare, use new run() method
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 10:08:23 +02:00
Nico Schottelius
ae8040536f mere tests of autorequire and resolver into execution_order
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 09:26:48 +02:00
Nico Schottelius
03bd44e135 Merge branch 'execution_order_plus_general_changes' 2013-05-15 09:19:52 +02:00
Nico Schottelius
a9ffa86b74 remove some old code, merge run into deploy_and_cleanup
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 09:19:36 +02:00
Nico Schottelius
72fef03184 Merge branch 'execution_order' into execution_order_plus_general_changes 2013-05-15 09:16:59 +02:00
Nico Schottelius
0b4914a7f3 +comment wording
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 09:16:52 +02:00
Nico Schottelius
e771e91043 Merge branch '__ssh_authorized_keys' of https://github.com/asteven/cdist 2013-05-10 13:13:13 +02:00
Steven Armstrong
d4bad031e9 bugfix: the parameter is named 'state' not 'present'
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-05-10 12:41:56 +02:00
Steven Armstrong
d72afd3903 dont change parameters; dont use tmpfile; update copyright
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-05-10 12:35:22 +02:00
Nico Schottelius
a265d87037 begin dry run in command line
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-02 16:41:16 +02:00
Nico Schottelius
f95052e56f remove unused modules
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:18:03 +02:00
Nico Schottelius
4882c2cf19 --resolver in config_install
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:16:38 +02:00
Nico Schottelius
956f400da6 re-arrange for future cleanup
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:15:22 +02:00
Nico Schottelius
2dac681f25 better error message
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:07:59 +02:00
Nico Schottelius
85d24ce259 fix execution order - seems to be fine now
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:07:27 +02:00
Nico Schottelius
8a7c64f86a cleanups + indent errors
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 11:04:01 +02:00
Nico Schottelius
a064cc19b3 try new object orientated (hrrr) code instead of stage based
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 10:58:23 +02:00
Nico Schottelius
002537f5d1 Merge pull request #169 from arkaitzj/global_explorers
Make global explorers available to initial manifest
2013-04-09 06:11:07 -07:00
Nico Schottelius
af75aa9024 use chmod to allow chmod being in a different path
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-08 19:58:22 +02:00
Arkaitz Jimenez
9dcad37acf Remove the umask requirement, set the proper permissions to base_path 2013-04-08 19:58:21 +02:00
Nico Schottelius
5152bdfce7 add hint for 0700, root:root behaviour of __directory --parents
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-03 16:49:03 +02:00
Nico Schottelius
352c7da46c quote the new value check - may contains spaces
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-04-02 09:21:01 +02:00
Nico Schottelius
dd566527a9 Merge branch 'user_create_home' of https://github.com/arkaitzj/cdist 2013-04-02 09:19:58 +02:00
Arkaitz Jimenez
4a89e64115 Make global explorers available to initial manifest and fix hostname explorer 2013-04-01 00:48:57 +02:00
Arkaitz Jimenez
60f85c5b85 __user support for --create-home 2013-04-01 00:02:22 +02:00
Arkaitz Jimenez
d59953642e crontab -l should be allowed to fail with "no crontab" without stopping exec 2013-04-01 00:01:22 +02:00
Nico Schottelius
44a0f5d7bb restore resolver test
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-22 11:13:44 +01:00
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
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
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
c620c2fa29 Merge pull request #155 from statianzo/directory-owner
Set permissions on existing directory
2013-01-31 13:05:10 -08:00
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
Eivind Uggedal
1b25ef33b9 Slackware os and os_version explorer support. 2013-01-28 08:30:54 -05:00
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
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
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