Commit graph

306 commits

Author SHA1 Message Date
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
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
Nico Schottelius
ee519b878d Merge remote-tracking branch 'steven/issue/200' 2013-09-18 12:31:39 +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