Commit graph

3297 commits

Author SHA1 Message Date
Nico Schottelius
91e1efe512 Merge pull request #60 from asteven/issue_dependency-inheritance-3
fix autorequire dependency handling
2012-05-03 04:43:30 -07:00
Steven Armstrong
7d61b77708 fix autorequire dependency handling
- inherit explicit requirements that the user defined himself
- but _not_ implicit requirements that cdist added for autorequire

Changes:
- added new .autorequire property to CdistObject to keep track of implicit autorequire dependencies
- Emulator appends implicit requirements to this .autorequire property
- DependencyResolver preprocess these .autorequire properties before resolving normal dependencies
- refactored and documented DependencyResolver so it's clearer what happens and easier to use from tests
- update test cases to match new DependencyResolver behaviour

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-05-03 10:16:08 +02:00
Nico Schottelius
3d0493bb65 ++changes(2.0.10)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-05-02 15:54:25 +02:00
Nico Schottelius
af27e9424e Merge pull request #53 from jdguffey/__jail
__jail type
2012-05-02 06:53:43 -07:00
Jake Guffey
4b11a6172d Fixed variable naming in /etc/fstab.$name
had referenced $jailbase when meaning to reference $jaildir
2012-04-30 17:29:08 -04:00
Jake Guffey
1a20f0087e Merge branch 'master' into __jail 2012-04-27 16:47:14 -04:00
Jake Guffey
14e851341a Implemented Nico's suggestions
Parameterized {jailbase,jaildir}
Replaced all usages of /usr/jail with $jaildir
Explicitly fail if $os isn't FreeBSD
Removed $__type/files/ as it is pointless to have now
Updated man page
2012-04-27 11:45:34 -04:00
Nico Schottelius
75aea91643 ++changes(2.0.10)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-27 11:39:08 +02:00
Nico Schottelius
c24788a452 Merge pull request #51 from pestaa/master
Fix sed for FreeBSD
2012-04-27 02:34:58 -07:00
Nico Schottelius
d3df37920d Merge branch 'issue_dependency-inheritance' of https://github.com/asteven/cdist 2012-04-27 11:16:28 +02:00
Steven Armstrong
2ff286cf1d inherit dependencies from defining object when setting up implicit dependencies through autorequire
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-25 17:18:16 +02:00
Jake Guffey
131889b454 Added jail_${name}_flags variable
To make future work, such as resource limiting (rctl(8)) easier, added
"-n ${name}" to jail_flags for each jail.
2012-04-23 14:39:26 -04:00
Jake Guffey
d39821782d Copy /root to $jailbase/rw/$name/root
Copies /root to ${jailbase}/rw/${name}/root
Adds /root to /etc/fstab.${name}
2012-04-23 13:43:27 -04:00
Nico Schottelius
bc1a2d769d ++title line
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-22 01:20:44 +02:00
Nico Schottelius
32d6cbb7a1 ++todo
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-22 01:20:32 +02:00
Jake Guffey
a4c89c5552 Merge branch 'master' into __jail 2012-04-18 13:13:11 -04:00
Jake Guffey
847fc9d8c1 Multiple bugfixes
fixed remote copy command
fixed problem with code-remote when jail_enable wasn't in rc.conf
fixed problem with code-remote when jail_list wasn't in rc.conf
added check to see if /etc/devfs.rules exists before trying to use it
added dependency on __directory/usr/jail
2012-04-11 14:53:28 -04:00
Jake Guffey
f5437ccce6 Bugfix for jail_list
If jail_list wasn't already defined in /etc/rc.conf, gencode-remote wasn't adding the variable to the file.
2012-04-06 13:32:59 -04:00
pestaa
deafcc60e8 Workound lack of pipeline's integrity guarantee. 2012-04-06 18:55:35 +02:00
pestaa
cd5050cc91 Merge branch 'master' of https://github.com/pestaa/cdist
Conflicts:
	conf/type/__start_on_boot/gencode-remote
2012-04-06 11:20:39 +02:00
pestaa
f9c945cc86 Changed tactics. Sed's -i flag is not cross-platform. 2012-04-06 11:15:06 +02:00
Istvan Beregszaszi
cb47a7d56f Fix indenting. 2012-04-06 00:29:14 +03:00
pestaa
0e11583b1e Fix sed argumenting on FreeBSD. While specifying -i flag is optional on GNU sed, it is mandatory on non-GNU variants. In order to keep behavior backward-compatible, the backup file is always removed. 2012-04-05 23:21:11 +02:00
Nico Schottelius
7d2799d958 Make __manifest usable in type manifests
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-04 17:21:54 +02:00
Nico Schottelius
689acb4c21 ++changes(2.0.10)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-04 09:47:52 +02:00
Nico Schottelius
0a03a15537 Merge branch '__start_on_boot' of https://github.com/asteven/cdist 2012-04-04 09:47:02 +02:00
Nico Schottelius
9da25ca4ea ++changes(2.0.10)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-04 09:44:57 +02:00
Nico Schottelius
a586d6b54b Merge branch '__file_exists' of https://github.com/asteven/cdist 2012-04-04 09:44:14 +02:00
Steven Armstrong
e3f767f5a1 += example
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-04 09:37:18 +02:00
Nico Schottelius
f2a51f1a10 Merge branch '__file_exists' of https://github.com/asteven/cdist 2012-04-04 09:32:08 +02:00
Steven Armstrong
ffcf57ee45 implement --state exists
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-04 00:08:23 +02:00
Jake Guffey
ace13f3582 Merge branch 'master' into __jail 2012-04-03 14:08:18 -04:00
Steven Armstrong
18a25dc65b file must be last argument
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-03 17:53:28 +02:00
Steven Armstrong
386c12f251 nested quotes should not be escaped
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-03 17:52:58 +02:00
Nico Schottelius
941e89f950 ++changes(2.0.10)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-03 06:00:00 +02:00
Nico Schottelius
e540502830 Missing cat in __package_yum
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-03 05:59:24 +02:00
Nico Schottelius
f3efa1e74d enable __start_on_boot on amazon linux
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-30 09:14:25 +02:00
Nico Schottelius
9832512bfd ++todos :-)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-26 18:12:06 +02:00
Nico Schottelius
fe4074b270 +update README
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-21 10:42:43 +01:00
Nico Schottelius
59f05ca4ad add old logfile
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-21 10:39:47 +01:00
Nico Schottelius
ada00862d7 Merge remote-tracking branch 'github/master' 2012-03-18 09:44:50 +01:00
Nico Schottelius
9682ce7ebb ++todo
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-18 09:44:44 +01:00
Nico Schottelius
e41fb0e73d Merge pull request #47 from jdguffey/master
fix to __package_pkg_freebsd
2012-03-18 01:36:42 -07:00
Jake Guffey
8c0b8905e4 Merge branch 'master' of https://github.com/jdguffey/cdist 2012-03-16 17:41:12 -04:00
Jake Guffey
33cb887acf Merge https://github.com/telmich/cdist 2012-03-12 16:44:25 -04:00
Nico Schottelius
2de7c92bbd ++todo
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-12 21:01:03 +01:00
Nico Schottelius
a013fa6b10 ++changes(2.0.10)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-12 20:58:53 +01:00
Nico Schottelius
856514d70f Merge remote-tracking branch 'mcodd/groupmod-redhat-exception' 2012-03-12 20:56:57 +01:00
Nico Schottelius
db14277b41 move __mysql_server to types_submitted_for_inclusion
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-12 20:54:41 +01:00
Nico Schottelius
8a6ac230aa Merge remote-tracking branch 'benedikt/type-mysql_server' 2012-03-12 20:52:56 +01:00