Commit graph

2114 commits

Author SHA1 Message Date
Nico Schottelius
28ba493e71 Merge branch 'master' into preos 2014-01-08 16:19:56 +01:00
Nico Schottelius
fccdcd768d Merge branch 'bugfix__directory' of https://github.com/dheule/cdist 2014-01-08 14:50:09 +01:00
Daniel Heule
afb06b729e mode and message handling now like __file type 2014-01-08 13:10:46 +01:00
Nico Schottelius
3f08565e59 Revert "install rubygems for ubuntu/debian"
On request by Steven.

This reverts commit d2c45717f1.
2014-01-08 11:09:01 +01:00
Daniel Heule
3e398b233b fix compare with leading 0 on directory mode 2014-01-08 09:48:04 +01:00
Nico Schottelius
f8c36c080e do not escape \ in --line
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-07 22:30:59 +01:00
Nico Schottelius
386a84eafc Merge branch 'bugfix__start_on_boot' of https://github.com/dheule/cdist 2014-01-07 17:47:15 +01:00
Daniel Heule
f5cee7a57d suses chkconfig has the same name, but works different 2014-01-07 17:31:45 +01:00
Steven Armstrong
d2c45717f1 install rubygems for ubuntu/debian
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-07 16:31:32 +01:00
Daniel Heule
dc8e9c6855 fix typo on optional parameter which is only a passthrough to
__package_zypper
2014-01-07 13:23:39 +01:00
Steven Armstrong
7ab5cd35ac missing parens -> matched what we did not want to match
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-21 22:49:06 +01:00
Steven Armstrong
49bdd83ea1 test for feature instead of type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-21 22:00:57 +01:00
Steven Armstrong
08762330e1 default to None, not empty list
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-21 21:59:47 +01:00
Nico Schottelius
fcbb27a648 Merge remote-tracking branch 'steven/issue/240' 2013-12-20 21:24:08 +01:00
Nico Schottelius
b34eadece2 Merge remote-tracking branch 'steven/issue/239' 2013-12-20 20:50:45 +01:00
Steven Armstrong
39f65d2ef7 leave conversion of list to underlying fsproperty
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-20 11:17:43 +01:00
Steven Armstrong
8b0eb5766a bugfix: handle non-existent default
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-20 10:56:46 +01:00
Nico Schottelius
ee25229a48 Merge remote-tracking branch 'dheule/bugfix_zypper_types_on_older_suse_relases' 2013-12-20 08:55:42 +01:00
Nico Schottelius
d288acbe30 Merge remote-tracking branch 'steven/issue/236'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__user/gencode-remote
2013-12-20 08:53:01 +01:00
Nico Schottelius
4353cff72e Merge remote-tracking branch 'steven/issue/239' 2013-12-20 08:50:00 +01:00
Nico Schottelius
7fad1074b6 Merge remote-tracking branch 'dheule/type__user' 2013-12-20 08:45:37 +01:00
Steven Armstrong
67f61eb7ec make default values for optional_multiple parameters work
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-19 23:33:43 +01:00
Nico Schottelius
1d0233fe4e Merge branch 'type__cron' of https://github.com/dheule/cdist 2013-12-19 15:00:16 +01:00
Daniel Heule
c50925cab5 bugfix in __cron type, was a wrong quoting 2013-12-19 14:45:55 +01:00
Daniel Heule
d6f84d1ef0 __start_on_boot incl. gentoo support 2013-12-19 13:54:16 +01:00
Steven Armstrong
80fffbad11 implement messaging for __user type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-19 11:21:44 +01:00
Steven Armstrong
9d54eb7257 implement messaging for __group type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-19 11:21:26 +01:00
Daniel Heule
e5253e0330 correct man page text of system parameter 2013-12-19 08:14:29 +01:00
Nico Schottelius
122fb96654 use default parameter for __start_on_boot type
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-18 18:09:57 +01:00
Daniel Heule
7d4c11a186 reset false mode changes 2013-12-17 14:15:41 +01:00
Daniel Heule
138d26e398 extended type __user: parameter state, system, remove-home new 2013-12-17 14:13:20 +01:00
Daniel Heule
a70d478f9e fixed a minor type with param remove-all-other-services 2013-12-16 17:07:49 +01:00
Daniel Heule
aec1632627 on older systems, zypper service and zypper repos
doesn't know the parameter -E,
so we need a way which works on older releases too
2013-12-16 16:19:27 +01:00
Steven Armstrong
14dee79a9b handle parameter --state explicilty to respect defaults
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-16 13:29:43 +01:00
Nico Schottelius
8854bc55d9 Merge branch 'type__package_emerge_dependencies' of https://github.com/dheule/cdist 2013-12-13 14:31:28 +01:00
Nico Schottelius
bdb4ffb449 Merge branch 'type__package_emerge' of https://github.com/dheule/cdist 2013-12-13 14:30:20 +01:00
Nico Schottelius
8e1cf76cd5 Merge branch 'type__package_zypper' of https://github.com/dheule/cdist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__package_zypper/man.text
2013-12-13 09:00:09 +01:00
Daniel Heule
c48f31389f initial submit of type __package_emerge_dependencies 2013-12-12 10:59:45 +01:00
Daniel Heule
fc8543eab6 initial submit of __package_emerge type 2013-12-12 10:56:15 +01:00
Daniel Heule
b12bd82fe2 corrected some minor spell misstakes 2013-12-12 09:29:22 +01:00
Daniel Heule
aaa142d76b __package_zypper can now handle the version parameter 2013-12-11 17:11:22 +01:00
Nico Schottelius
4bb8dc2f53 2012 -> 2013
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-11 14:43:35 +01:00
Nico Schottelius
f955191d77 Merge remote-tracking branch 'dheule/type__package_zypper' 2013-12-11 14:39:32 +01:00
Daniel Heule
785e54b311 vorbereitung um mit zypper auch spezifische versionen zu unterstützen
parameter ptype auch beim package type zulassen, analog anderer
parameter von subtypes ...
2013-12-11 13:44:01 +01:00
Daniel Heule
01dc23b00c postfix install works also on suse (SLES11) 2013-12-11 13:07:40 +01:00
Daniel Heule
0acf3c0118 type __postfix_postconf is tested and aproved to work on suse (SLES11) 2013-12-10 17:25:03 +01:00
Daniel Heule
e1eae5604e unlock the whole power of zypper
added the ptype parameter (package type of zypper install)
2013-12-10 16:57:02 +01:00
Nico Schottelius
ae438b9719 Merge pull request #220 from dheule/type__zypper_service
new type  __zypper_service
2013-12-10 06:43:38 -08:00
Daniel Heule
f7f63aa7a2 remove SFS from man page text ... 2013-12-10 11:54:42 +01:00
Daniel Heule
0f1dabb080 inital commit of __zypper_service 2013-12-10 11:50:18 +01:00
Steven Armstrong
d068dfd621 escape and thereby preserve quotes in values
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-10 11:02:10 +01:00
Daniel Heule
e6420a49e8 verhindern dass raw and raw_command zusammen angegeben werden 2013-12-09 11:39:44 +01:00
Daniel Heule
02aad6f4cc revert vom chmod der aus versehen geändert wurde ... 2013-12-09 09:57:31 +01:00
Daniel Heule
c0da6fcc89 Verbesserungen am __cron type
1. Filter messages from crontab -l welche das ganze file füllen
2. neuer parameter raw_command, um globale variablen zu setzen ...
2013-12-09 09:44:40 +01:00
Nico Schottelius
fe20da6594 note hint from Axel Beckert for debian prios
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-07 00:13:28 +01:00
Nico Schottelius
a89926c40b Merge branch 'dheule/type__zypper_repo' 2013-12-06 23:53:46 +01:00
Daniel Heule
a271244cfb Die 4 codepaths mit comments erklaert ... 2013-12-06 15:23:09 +01:00
Steven Armstrong
367ef21bd8 make __postfix_* types depend on __postfix
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-12-06 13:49:45 +01:00
Daniel Heule
59de2afdaa ups, was a variable collision 2013-12-05 13:14:15 +01:00
Daniel Heule
512b410012 korrektur eines typos ... 2013-12-05 08:47:57 +01:00
Daniel Heule
e1a2ebab5c gencode-remote gibt nur noch befehle aus wenn was zu tun ist ... 2013-12-05 08:45:12 +01:00
Nico Schottelius
a5fc3f5002 remove changed attribute of an object - was never used and will never be used
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-04 21:29:56 +01:00
Daniel Heule
72bbf93282 korrekte ids, hier werden von zypper keine quotes erwartet, da nur
zahlen moeglich sind
2013-12-04 15:32:31 +01:00
Daniel Heule
a37c48ed43 bei dem repo_id eine kleine verschoenerung 2013-12-04 15:24:18 +01:00
Daniel Heule
33a4f07bb4 in der manpage state parameter besser erlaeutert ...
TODO: howto line breaks in html ?
2013-12-04 15:22:48 +01:00
Daniel Heule
ea33b093f0 cleanup of variable quoting 2013-12-04 14:58:15 +01:00
Daniel Heule
808ea30634 Korrektur der intention, vim hat mich verschaukelt ... 2013-12-04 14:50:11 +01:00
Nico Schottelius
84eb05aed6 Merge branch 'master' into preos
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	docs/changelog
2013-12-04 14:44:54 +01:00
Nico Schottelius
acd42b259b do not generate code when mode = 0xxx format
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-04 13:37:15 +01:00
Nico Schottelius
ed10f4e5b4 use default parameter
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-04 13:19:25 +01:00
Nico Schottelius
b9dcd01ea1 only restart the firewall (iptables) if needed
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-04 13:19:04 +01:00
Daniel Heule
6a68c14a76 letzter feinschliff bei der man page ... 2013-12-04 10:56:45 +01:00
Daniel Heule
19219fe1f9 An allen orten correcte gpl headers eingesetzt ... 2013-12-04 09:44:45 +01:00
Daniel Heule
b29a52db1a Initial add vom type __zypper_repo 2013-12-04 09:37:01 +01:00
Nico Schottelius
68b7392021 add support for messaging to __file, document messaging in reference
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-03 15:41:43 +01:00
Nico Schottelius
684ad56a80 Merge branch 'master' into notifications
Took the __file parts from master.

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__file/gencode-local
	cdist/conf/type/__file/gencode-remote
2013-12-03 14:38:11 +01:00
Nico Schottelius
90896a9e06 update environment with messages environment
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-03 14:36:38 +01:00
Nico Schottelius
a95167b374 remove quotes from mkdiropt
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-02 15:49:02 +01:00
Daniel Heule
d074713b94 Fix explorer and globalopts issue in type __package_zypper
Fixes #215.

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-02 13:27:42 +01:00
Nico Schottelius
a6e2cf853e mkdiropt needs to be unquoted => empty if not existing
Otherwise this happens:

    root@lilly ~ # cat
    /var/lib/cdist/object/__directory/vm/.cdist/code-remote
    rm -f "/vm"
    mkdir "" "/vm"

which results into

    mkdir: cannot create directory `': No such file or directory

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-01 22:33:13 +01:00
Nico Schottelius
e58a467327 Merge branch 'master' into preos 2013-12-01 18:42:49 +01:00
Nico Schottelius
7cf0d60b08 catch permissionserror when deleting old cache
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-01 18:42:07 +01:00
Nico Schottelius
48923d23d8 if ... THEN ;-)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-01 18:37:08 +01:00
Nico Schottelius
adab987994 minor updates for preos
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-29 16:02:00 +01:00
Nico Schottelius
65cab0d0e8 add "preos" subcommand to generate preos
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-28 14:18:24 +01:00
Nico Schottelius
f47d2c22bc Merge remote-tracking branch 'steven/issue/202'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__link/explorer/type
2013-11-27 16:24:20 +01:00
Nico Schottelius
dfe4274467 Merge remote-tracking branch 'steven/issue/201'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__directory/explorer/stat
	cdist/conf/type/__directory/explorer/type
2013-11-27 16:23:16 +01:00
Nico Schottelius
08dbf2e96c Merge remote-tracking branch 'steven/issue/198' 2013-11-27 16:22:14 +01:00
Steven Armstrong
abf291cb20 add gpl header
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:09:02 +01:00
Steven Armstrong
71b41df733 no late delete
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:09:02 +01:00
Steven Armstrong
6d5686229f only delete links; delete existing destination before creating links
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:09:02 +01:00
Steven Armstrong
f5a39e5281 add gpl header
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:08:50 +01:00
Steven Armstrong
7b065e931f rewrite type to work analog to __file and __link
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:08:50 +01:00
Steven Armstrong
d7984df503 make explorers executable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:08:50 +01:00
Steven Armstrong
6c3b1e3ca0 add gpl header
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:05:10 +01:00
Nico Schottelius
de4db39f88 Merge remote-tracking branch 'steven/issue/201' 2013-11-27 15:15:03 +01:00
Nico Schottelius
965526a930 Merge remote-tracking branch 'steven/issue/202' 2013-11-27 15:14:10 +01:00
Steven Armstrong
fcfd2d0a3c refactor so that there is no interaction between code-local and code-remote
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:18 +01:00
Steven Armstrong
a3dea70a97 Revert "first generate and execute *-local, then *-remote"
This reverts commit cf22499538266b1b4fac1694254edfd8ba9be68d.
2013-11-26 16:31:18 +01:00
Steven Armstrong
f82c4dc669 no late delete
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:17 +01:00
Steven Armstrong
5918de368d fix quoting, remove redundant code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:17 +01:00
Steven Armstrong
12ef3ca4d2 first generate and execute *-local, then *-remote
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:17 +01:00
Steven Armstrong
db29ea8e70 intial take on fixing the file type
- upload file in a safer way
- remove destination if it is not a file
- only set attributes if required

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:17 +01:00
Nico Schottelius
2f842d56eb integrate messaging into gencode, manifest
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 01:17:37 +01:00
Nico Schottelius
edec2abb1d adopt first type: __file for messaging
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 01:01:44 +01:00
Nico Schottelius
ac5fa7cd64 integrate messaging into cdist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 01:01:30 +01:00
Nico Schottelius
22a83d2c93 add new message object
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 00:27:08 +01:00
Nico Schottelius
d1a569fecd remove bug comments -> no bug here
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-25 23:18:19 +01:00
Nico Schottelius
d00947711d Merge branch 'master' into notifications 2013-11-25 22:54:36 +01:00
Nico Schottelius
2932b8343f use printf instead of echo to avoid bash broken echo builtin
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-25 19:08:46 +01:00
Nico Schottelius
95513ab538 __line: handle fixed strings correctly, posix gave us -F -x for this case
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-29 12:23:07 +01:00
Steven Armstrong
9db28fab97 no late delete
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-10-15 14:55:35 +02:00
Nico Schottelius
e7e610d829 add state parameter
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-14 22:05:29 +09:00
Nico Schottelius
465749f377 use localedef - locale-gen is a bad wrapper script
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-14 21:38:47 +09:00
Nico Schottelius
e0b009308a initial template for __locale
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-14 21:27:07 +09:00
Nico Schottelius
9ded11daf0 Merge branch 'type/__postfix' of git://github.com/asteven/cdist 2013-10-10 10:04:44 +09:00
Nico Schottelius
1c7f8baa02 Merge remote-tracking branch 'github/master' into 2.3 2013-10-10 09:55:55 +09:00
Nico Schottelius
49c686319e add more exapmles to cdist-manifest
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-10 09:51:26 +09:00
Nico Schottelius
9b2d630807 do not install recommends by default
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-09 21:47:37 +09:00
Steven Armstrong
5cc894e1e9 only use a single space to distinguish between the actual __target_host and the same used as part of the path; fixes #206
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-10-03 09:55:14 +02:00
Nico Schottelius
ba3819a83e Merge remote-tracking branch 'github/master' 2013-09-27 23:25:51 +02:00
Steven Armstrong
d166224e68 create tmpfile on same volume as existing file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-27 22:06:08 +02:00
Steven Armstrong
c769d0b681 preserve ownership and permissions of existing file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-27 22:05:02 +02:00
Steven Armstrong
8a7639c191 preserve ownership and permissions of existing files
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-27 21:51:36 +02:00
Nico Schottelius
2b66889105 __line: support line/regexp containing /
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-26 16:26:01 +02:00
Steven Armstrong
97a8793fdd add __postfix* types
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-24 15:54:14 +02:00
Steven Armstrong
4bee421f97 rewrite type to work analog to __file and __link
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-18 13:26:03 +02:00
Nico Schottelius
ee519b878d Merge remote-tracking branch 'steven/issue/200' 2013-09-18 12:31:39 +02:00
Steven Armstrong
067614db1f make explorers executable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-18 11:14:18 +02:00
Steven Armstrong
bba68b6e40 only delete links; delete existing destination before creating links
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-18 10:40:29 +02:00
Steven Armstrong
472198419a don't assume first argument to be -r, fixes #200
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-12 22:28:29 +02:00
Steven Armstrong
589d50bdba make --dry-run work, fixes #199
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-12 21:57:22 +02:00
Steven Armstrong
127c512f84 call systemctl in subshell to prevent the explorer from failing if it exits non zero
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-08 22:10:25 +02:00
Nico Schottelius
d0dfe8f834 Merge branch 'feature/default_parameters' of https://github.com/asteven/cdist 2013-09-05 13:44:32 +02:00
Nico Schottelius
98cdc6c139 fix tests so that the explorers are not changed while running tests
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-05 13:02:39 +02:00
Nico Schottelius
33559fad67 add comments to some tests
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-04 23:33:52 +02:00
Steven Armstrong
fc40a40ae0 implement configurable default values for parameters
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-04 22:11:42 +02:00
Steven Armstrong
1927d4852a add tests for configurable default values for parameters
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-09-04 22:11:08 +02:00
Nico Schottelius
a4151fee44 fix shell from previous context change
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-03 21:32:26 +02:00
Nico Schottelius
5a2873efc8 remove customer types
Should not have been committed here - sorry for the noise.

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-03 09:11:12 +02:00
Nico Schottelius
e3f401900a add the type as well...
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-02 19:58:11 +02:00
Nico Schottelius
f8d3e36efb new type: __iptables_apply
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-02 19:29:11 +02:00
Nico Schottelius
0f6b6f420c new type: __iptables_rule
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-02 19:22:53 +02:00
Nico Schottelius
73338c330b record the type name, if there is no such type
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-02 11:30:22 +02:00
Nico Schottelius
6cd419b334 have __motd regenerate on Debian/Ubuntu
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-02 11:26:32 +02:00
Nico Schottelius
6af7eadc89 add --shell to __cdist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-02 11:21:19 +02:00
Nico Schottelius
4d8840dba0 also setup homedir
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-02 10:50:42 +02:00
Nico Schottelius
93f5ace932 clenaup logging in emulator, cleanup emulator in main script
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-09-02 10:49:11 +02:00
Nico Schottelius
760b7e7afb ++changes(2.3.2)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-30 02:55:22 +02:00
Steven Armstrong
3de9b869ac there is no such thing as cdist install in master
remove all traces of it to prevent the ongoing merge issues when using the real thing

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-08-29 21:56:53 +02:00
Nico Schottelius
2286acc6f2 fix some more tests for the next release
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-28 15:44:52 +02:00
Nico Schottelius
e6feee14fb Merge branch 'enhance_cache'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/test/code/__init__.py
	cdist/test/config_install/__init__.py
	cdist/test/explorer/__init__.py
2013-08-28 15:43:03 +02:00
Nico Schottelius
136ddc05b5 context based changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-28 15:39:17 +02:00
Nico Schottelius
18c5e60ab1 --context in tests
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-28 15:34:52 +02:00
Nico Schottelius
74e003d29b +print cdist version on startup + exit_code = 2 for irq
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-21 18:52:35 +02:00
Nico Schottelius
91cf68363b Merge branch 'issue_191' of https://github.com/asteven/cdist 2013-08-20 00:21:36 +02:00
Steven Armstrong
8aacbe2885 Bourne is not bash
see http://shebang.brandonmintern.com/bourne-is-not-bash-or-read-echo-and-backslash/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-08-19 22:25:17 +02:00
Nico Schottelius
975b93c20a fix all tests -> back to normal
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 13:37:40 +02:00
Nico Schottelius
b527479620 refactor out_path -> base_path
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 13:35:03 +02:00
Nico Schottelius
866645679a throw a better exception when environment variables are missing
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 13:34:29 +02:00
Nico Schottelius
2f5de23ae9 out_path -> base_path
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 12:03:25 +02:00
Nico Schottelius
ffeaa3d06b fix old bug / joining wrong args
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:45:43 +02:00
Nico Schottelius
a76d8bb517 :%s/self.out_path/self.base_path/g
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:45:22 +02:00
Nico Schottelius
8298bb0bf5 fix test cdist.test.config_install.ConfigInstallRunTestCase
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:33:44 +02:00
Nico Schottelius
b3cf339d06 fallback to sys.argv[0] by default
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:21:53 +02:00
Nico Schottelius
cd8695d3eb move create_files_dirs more to up - it is similar to init()
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 08:48:41 +02:00
Nico Schottelius
d1708c78b6 refactoring
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 01:38:28 +02:00
Nico Schottelius
eaf1721212 begin to migrate to '--output-base-path', shrink context
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:52:15 +02:00
Nico Schottelius
b9a6cf7c6a remove context from shell
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:38:19 +02:00
Nico Schottelius
a7fe8b4ed2 port context -> remote
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:36:25 +02:00
Nico Schottelius
f79727559a ++logs and migrate context -> local
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:33:58 +02:00
Nico Schottelius
83c981f477 begin to implement -C --cache-dir
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:03:57 +02:00
Nico Schottelius
49d9f1f475 support relative paths in -c argument
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-12 12:56:54 +02:00
Nico Schottelius
263a8a73a7 minor cleanups
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-12 12:11:43 +02:00
Nico Schottelius
32f878ad00 update docs, document exit code bug
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-12 11:42:00 +02:00
Nico Schottelius
4e46cf8ce4 begin to document shell changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 21:12:21 +02:00
Nico Schottelius
79fea569b9 some shell related cleanups
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 20:58:45 +02:00
Nico Schottelius
c793825edb re-arrange REMOTE_COPY/EXEC for Shell use
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 17:52:34 +02:00
Nico Schottelius
2403fc59ee refactor commandline: merge into its own class (and add first shell code)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 09:24:10 +02:00
Nico Schottelius
c1441fc676 enhance singleton testing
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-10 17:21:38 +02:00
Nico Schottelius
8ab760ad90 document unit test
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-10 17:02:19 +02:00
Nico Schottelius
b84d3393a0 Merge branch 'remove-singleton-object_id' of https://github.com/asteven/cdist 2013-07-10 16:55:41 +02:00
Steven Armstrong
7205cd5ecf remove that crappy old singleton object_id thingy
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-07-10 16:31:58 +02:00
Nico Schottelius
ff50a61344 use shortcut version in __package_opkg
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-10 14:16:56 +02:00
Nico Schottelius
dbe65795f5 remove dry_run from object_run
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-05 15:27:34 +02:00
Nico Schottelius
5f318d5de3 print warning in case dry run is activated
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-05 15:12:49 +02:00
Nico Schottelius
5bad25cd6d add dry_run hint to verbose messages, not debug
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-05 15:02:36 +02:00
Nico Schottelius
3c14f7e2f5 add dry run hint
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-05 15:00:23 +02:00
Nico Schottelius
ab50d8561b add new type: __cdist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-04 14:34:17 +02:00
Nico Schottelius
9326adf34b fix refactor error
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-24 13:23:31 +02:00
Nico Schottelius
25bdcb1602 cleanup tests and ... - 100% green
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 22:39:20 +02:00
Nico Schottelius
ef24ec4db8 port test_missing_requirements to config_install unit test
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 21:50:21 +02:00
Nico Schottelius
e1d8645415 fix unit tests for config_install
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 21:48:15 +02:00
Nico Schottelius
4ec1afc47f also remove obsolete save_cache function
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 16:55:54 +02:00
Nico Schottelius
14a3bf7262 move save_cache into local
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 16:52:56 +02:00
Nico Schottelius
4758daa037 move types into conf/ dir
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 16:38:50 +02:00
Nico Schottelius
347ff8900e split directory creating code off of init
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 16:35:19 +02:00
Nico Schottelius
b1d661f4c0 merge ResolverTestCase and AutorequireTestCase into ExecutionOrderTestCase
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-20 11:30:20 +02:00
Nico Schottelius
b2686f3b13 factor out iterate code to be able to test it for one, two, ... runs
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-20 11:24:47 +02:00
Nico Schottelius
c5c5e7b89b remove requirement-finder tests - no need to test assignments and no wildcard support anymore
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-20 11:17:30 +02:00
Nico Schottelius
4ae241259f remove the old entries on change
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-20 09:20:14 +02:00
Nico Schottelius
d78dc7af8b Merge branch '__cron-simplify' 2013-06-19 21:50:49 +02:00
Nico Schottelius
e7527802a5 more hints for __debconf_set_selections
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 18:53:07 +02:00
Nico Schottelius
622cd398c6 use quiet mode by default
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 18:51:23 +02:00
Nico Schottelius
84f2ca0d1f add new type: __update_alternatives
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 18:49:43 +02:00
Nico Schottelius
137856002f Merge branch 'master' into __cron-simplify 2013-06-19 11:31:33 +02:00
Nico Schottelius
4ecffa7d59 fix typo in __process
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 11:31:21 +02:00
Nico Schottelius
fb40ba4d0f Merge branch 'master' into __cron-simplify 2013-06-19 11:20:25 +02:00
Nico Schottelius
135499f120 __process: make --state optional
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 11:19:45 +02:00
Nico Schottelius
1c94c615b1 __cron: remove parameter changing code, remove multiline code, remove early execution of included $() code, simplify __cron
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 10:55:07 +02:00
Nico Schottelius
1788b343d1 Merge branch '__postgres_role-changes' of https://github.com/nuex/cdist 2013-06-18 13:40:18 +02:00
nuex
90f7ec40fe __postgres_database: make state parameter optional 2013-06-17 13:49:36 -04:00
nuex
48b6344645 __postgres_role: check if state parameter exists before reading it 2013-06-17 11:16:26 -04:00
nuex
dc39099730 __postgres_role: make state parameter optional, fix password parameter checking in gencode-remote 2013-06-17 11:05:23 -04:00
nuex
211363d5be __git: quote variables in gencode-remote, add optional parameters in manpage 2013-06-16 01:40:11 -04:00
Nico Schottelius
2acce10497 change __start_on_boot to use systemd on archlinux
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-09 23:45:22 +02:00
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
Nico Schottelius
7a41d6d8fa __file: notify when doing changes
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-01-20 18:11:47 +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
Nico Schottelius
6c9606330c Merge branch 'master' into type__rbenv 2013-01-02 22:32: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
Jake Guffey
7d7ad2630c Fix issue #147
--state absent should imply --stopped.
2012-12-11 11:15:21 -05:00
Nico Schottelius
67c7351bec install the right package, not pyro...
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-09 11:49:26 -08:00
Nico Schottelius
ed7b6d1a68 add linebreak, add broken require
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-06 00:01:01 +01:00
Nico Schottelius
fe143d57b8 add new type: __rbenv
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-05 23:43:24 +01:00
Nico Schottelius
3167ececc6 add owner/group support to __git
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-05 23:16:03 +01:00
Nico Schottelius
8b91e3116a create working version of __git
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-05 23:07:21 +01:00
Nico Schottelius
5a3dc38e60 Merge branch 'master' into type__git 2012-12-05 22:46:07 +01:00
Steven Armstrong
56b6c95ed4 implement conf-dir from CDIST_PATH environment variable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-30 16:46:17 +01:00
Nico Schottelius
f37f3d201c __ssh_authorized_key has been superseeded by __ssh_authorized_keys
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-30 14:41:47 +01:00
Steven Armstrong
1ef5bcaa74 new type: __ssh_authorized_keys - manage ssh authorized_keys files
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-30 11:59:38 +01:00
Steven Armstrong
3a419ed58b make type explorers executable after transfering them
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-30 10:31:15 +01:00
Nico Schottelius
868421bf16 Update examples to match new parameters
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-30 10:01:37 +01:00
Nico Schottelius
1bd27fffae __jail: started -> stopped, correct help output
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-27 10:57:10 +01:00
Nico Schottelius
fd8fdf8b54 Merge branch 'master' into type__jail_boolean 2012-11-27 08:58:14 +01:00
Nico Schottelius
8bf196fdc0 add helpful log message when resolving dependencies
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-20 22:41:38 +01:00
Nico Schottelius
b996dcbae1 bugfix __qemu_img
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 17:42:39 +01:00
Nico Schottelius
8408f433e9 remove type from here - goes into cdist-nico repo
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 17:27:35 +01:00
Nico Schottelius
a6452cfabd rename type to reflect new environment
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 17:24:38 +01:00
Nico Schottelius
3dfad32d4c add new type: __localch_kvm_vm
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 17:24:01 +01:00
Nico Schottelius
2fe647a1f7 Revert "implement before/after to declare dependencies and deprecate require"
Comment from asteven:
    Some problems showed up while updating the docs and tests.
    You should revert the merge for now.

This reverts commit 84770b9ef2.
2012-11-19 15:17:46 +01:00
Nico Schottelius
d4fc49fa6b begin manpage
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 15:13:57 +01:00
Nico Schottelius
d419722a24 adapt documentation to use boolean parameter as well
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 13:43:45 +01:00
Nico Schottelius
bb19902581 Merge branch 'master' into type__jail_boolean 2012-11-19 13:40:59 +01:00
Nico Schottelius
4718b81a08 Documentation cleanup (old pre-boolean variant)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 13:40:35 +01:00
Nico Schottelius
67545eda79 Merge remote-tracking branch 'steven/issue_140' 2012-11-19 13:35:21 +01:00
Nico Schottelius
4ab51df2c8 Merge pull request #139 from asteven/2.1_before-after
implement before/after to declare dependencies and deprecate require
2012-11-19 04:27:09 -08:00
Nico Schottelius
4e3bab81d5 Merge pull request #138 from asteven/issue_138
file from stdin is broken
2012-11-19 04:17:43 -08:00
Steven Armstrong
7f0ae7928a fix state explorer to properly detect already existing ppa
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-19 13:05:23 +01:00
Steven Armstrong
84770b9ef2 implement before/after to declare dependencies and deprecate require
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

--whitespace

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-19 12:29:49 +01:00
Steven Armstrong
6d430524f1 binary all the way, fixes issue #138
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-19 12:04:07 +01:00
Nico Schottelius
13968d16f6 change __jail to boolean, fixes #128
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 10:36:52 +01:00
Nico Schottelius
327a0f2844 remove --groups from __user type
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-18 23:31:19 +01:00
Steven Armstrong
b0ac5fe78d update __jail type to match changed signature of __directory: fixes #135
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-16 21:18:08 +01:00
Nico Schottelius
9c5926f697 Merge branch '__user_groups' of https://github.com/asteven/cdist 2012-11-16 15:58:57 +01:00
Nico Schottelius
500c194328 Merge branch 'issue_126' of https://github.com/asteven/cdist 2012-11-16 15:34:58 +01:00
Steven Armstrong
28e8632097 new type: __user_group: manage user groups
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-16 15:31:33 +01:00
Steven Armstrong
6c685e61d5 fixes #126
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-16 15:27:32 +01:00
Steven Armstrong
e4910933b1 __apt_ppa: /enabled/present/ -e /disabled/absent/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-16 14:56:20 +01:00
Nico Schottelius
e6bf226036 convert __rvm_gmeset to boolean parameter
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-15 17:47:06 +01:00
Nico Schottelius
18dd0ebd33 ensure global and type explorers are executable on the remote side
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-15 17:37:15 +01:00
Nico Schottelius
80c6592ec8 add hints to related manpages
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-15 09:49:37 +01:00
Nico Schottelius
2fca87eda8 ++comment
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-15 09:34:19 +01:00
Nico Schottelius
a498330bd3 remove _read_stdin and open stdin file in non-binary mode
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-15 09:32:44 +01:00
Nico Schottelius
482ec3c5d8 make --default boolean in type __rvm_ruby
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 19:27:17 +01:00
Nico Schottelius
3d4bb3837f documentation cleanups
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 19:22:02 +01:00
Nico Schottelius
0eda57986f remove parameter changing code in __key_value (fixes #114,#36)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 18:28:58 +01:00
Nico Schottelius
344e08ddda Archive __autofs types (fixes #116)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 18:22:25 +01:00
Nico Schottelius
47424bf200 update __package* manpages
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 18:15:15 +01:00
Nico Schottelius
13d6644966 do not report errors on missing gemset
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 18:10:15 +01:00
Nico Schottelius
347c620eed indent
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 18:08:03 +01:00
Nico Schottelius
aeff2bcb0f indention
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 18:06:11 +01:00
Nico Schottelius
82830f191d link __process to __start_on_boot and vice versa
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 18:04:49 +01:00
Nico Schottelius
7814ece7b7 remove parameter changing code
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 18:01:30 +01:00
Nico Schottelius
2cfa046cdd indentions, whitespace
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 17:57:47 +01:00
Nico Schottelius
8ab408f890 remove parameter change code
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 17:52:05 +01:00
Nico Schottelius
7a44f30574 simplify manifest
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 17:47:55 +01:00
Nico Schottelius
a0add17cf8 ++exit 1
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 17:44:54 +01:00
Nico Schottelius
265d1af56a rename vm to diskimage, ensure state is setup
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 17:40:39 +01:00
Nico Schottelius
ace897de25 simplify timezone manifest
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 17:28:27 +01:00
Steven Armstrong
6adb20b829 __ssh_authorized_key: /installed/present/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-07 16:57:31 +01:00
Steven Armstrong
324a88c435 __timezone: set timezone in /etc/timezone on debuntu
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-07 16:57:31 +01:00
Steven Armstrong
f769b395c2 __file: implement --state exists
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-07 16:57:31 +01:00
Steven Armstrong
8f525fbc83 __apt_update_index: ignore top level directory
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-07 16:57:30 +01:00
Steven Armstrong
7e951fd4d1 __apt_ppa: /installed/present/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-07 16:57:30 +01:00
Steven Armstrong
03cc2a63b1 types to handle autofs maps
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-07 16:57:30 +01:00
Steven Armstrong
7a1f81dc7b remove install types
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-07 16:54:34 +01:00
Nico Schottelius
1bb3c82d72 cleanup some logging stuff
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 11:47:26 +01:00
Nico Schottelius
7d57d1df79 update emulator tests to work again
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 11:05:40 +01:00
Nico Schottelius
e2e1d0bb67 include %
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 11:05:29 +01:00
Nico Schottelius
4dd0f61934 --whitespace
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 10:51:13 +01:00
Nico Schottelius
217d2bcb23 Fix test: StdinTestCase
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 10:49:51 +01:00
Nico Schottelius
45d5e4719a read from stdin using read, not buffer.read() to be compatible with other IO streams
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 10:49:11 +01:00
Nico Schottelius
1e4833781e distinguish between user supplied and derived manifest on error printing
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 10:48:30 +01:00
Nico Schottelius
a32d3abd33 allow to pass in environment into emulator
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 10:25:47 +01:00
Nico Schottelius
7b51e22922 allow to read stdin from different handle than sys.stdin in emulator
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 09:58:47 +01:00
Nico Schottelius
e785092935 allow Manifest to differentiate between supplied and implicit found initial manifest
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-07 09:07:18 +01:00
Nico Schottelius
9cf80f5fdf make use of env provided by manifest
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 22:39:25 +01:00
Nico Schottelius
6482863c5d allow manifest to return env for usage from external
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 22:32:18 +01:00
Nico Schottelius
28bf0c3ed8 setup target_host for tests in test main class
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 21:52:11 +01:00
Nico Schottelius
aedb3669c7 print hint if initial manifest is missing
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 21:46:02 +01:00
Nico Schottelius
866f23ea2c inject conf_dir for emulator test
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 21:32:54 +01:00
Nico Schottelius
a22e729a3c raise special error on missing manifest
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 21:32:37 +01:00
Nico Schottelius
c47d0fae1c fix autorequire test case and fix cdist_base_path test assignment
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 17:28:26 +01:00
Nico Schottelius
bb1a8d8e66 fixup manifest tests
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 17:01:20 +01:00
Nico Schottelius
04bd5d88c3 Fix tests for code
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 16:58:30 +01:00
Nico Schottelius
4a67d768d5 fix all explorer test cases
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 16:47:51 +01:00
Nico Schottelius
b6f61a632f __postgres_role: switch to boolean, use shortcut version
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 22:56:45 +01:00
Nico Schottelius
03d224c74c add hint to db from role
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 22:43:19 +01:00
Nico Schottelius
5308d2cfe7 link to role from database
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 22:35:52 +01:00
Nico Schottelius
0eac132b83 adjust gemset explorer to work with new rvm version (fixes #108)
See https://github.com/wayneeseguin/rvm/issues/1285

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 21:46:08 +01:00
Nico Schottelius
df88d98ea0 many cleanups to __rvm* types
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 17:35:13 +01:00
Nico Schottelius
d5955bbb4d reference dependency package as well
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 17:19:30 +01:00
Nico Schottelius
c779e16fe2 __rvm: use shortcut version
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 17:18:57 +01:00
Nico Schottelius
d97f6794d0 run rvm as user, not as root
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 17:16:25 +01:00
Nico Schottelius
13fc5aa8f5 use shortcut version to exit if nothing is to be done
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 17:15:16 +01:00
Nico Schottelius
5eac7512a5 fix dependencies for __rvm_ruby
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 17:04:00 +01:00
Nico Schottelius
384a20ffbc building ruby requires bzip2 to be present to extract the tar.bz2
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 16:58:52 +01:00
Nico Schottelius
90fad0fe83 create remote base in test - needed?
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-02 14:15:14 +01:00
Nico Schottelius
184e2bd9c5 add new remote that does local calls
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 18:25:29 +01:00
Nico Schottelius
09fd809032 add new remote handler which turns remote into local ;-)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 18:22:52 +01:00
Nico Schottelius
5ec586f764 begin to cleanup explorer test case
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 18:21:56 +01:00
Nico Schottelius
528901bdee update a lot of tests for new exec.local
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 15:20:10 +01:00
Nico Schottelius
af24165367 introduce home_dir as a property
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 15:17:46 +01:00
Nico Schottelius
69a3844332 fix some tests and fix home_dir lookup
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 14:48:51 +01:00
Nico Schottelius
1177286d4e cleanups of tests (especially exec.local)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 14:42:55 +01:00
Nico Schottelius
6ecfb28d93 name parameter correctly add_conf_dirs
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 14:14:52 +01:00
Nico Schottelius
6eddaaf090 rename parameter correctly to add_conf_dirs
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 13:46:01 +01:00
Nico Schottelius
32a94a0f89 adjust emulator test to pass exec_path to local
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 13:35:52 +01:00
Nico Schottelius
4946fe2654 adjust paths in test 2012-11-01 13:34:48 +01:00
Nico Schottelius
6771a13758 pass exec_path from context to local, making it obsolete to manually add the argument to the _link_types_for_emulator
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 13:30:45 +01:00
Nico Schottelius
081d3aea37 remove manifests, which are not needed anymore (in production without them for some months)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 11:09:45 +01:00
Nico Schottelius
1d1149deab +debug
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 16:36:32 +01:00
Nico Schottelius
c25c986992 re-add sample, but longer name
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 16:33:18 +01:00
Nico Schottelius
e7be0cceab big change for pre4
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 16:16:59 +01:00
Nico Schottelius
92d21a4625 remove init.sample from this place in the distribution
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 16:14:02 +01:00
Nico Schottelius
e41aae041a fix cache_dir syntax error
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 16:11:03 +01:00
Nico Schottelius
dcaa70e6be be consistent in remote
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 16:07:00 +01:00
Nico Schottelius
cbe95b18e6 rename function to reveal new task: create_files_dirs
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 16:06:27 +01:00
Nico Schottelius
1e264afa63 refactor code to allow multiple directories to be passed in
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 16:05:37 +01:00
Nico Schottelius
b0e8c23078 initial change to support multiple conf_dirs
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 15:59:21 +01:00
Nico Schottelius
6ece8a97c7 use obsolete lib path
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 14:54:05 +01:00
Nico Schottelius
63573a9797 make package_data work
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-29 22:50:27 +01:00
Nico Schottelius
85fcfb1744 correct __file link again
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 23:48:56 +02:00
Nico Schottelius
3cf59fdf9a always use dynamic version - on shipping included generated version
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 23:45:56 +02:00
Nico Schottelius
91c1374657 begin restructering for python package
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 23:37:15 +02:00
Nico Schottelius
5d319027d0 Merge branch 'master' into 2.1_pypi_integration
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	.gitignore
	build
2012-10-25 22:35:20 +02:00
Nico Schottelius
392ec3c5ed correct link to __file
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:46:19 +02:00
Nico Schottelius
c9f728e073 lib/cdist => cdist (pypi)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:21:58 +02:00