From 44fd2e3c1ce0f59e0c0b0d4de54c4c5a2955b4f9 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:23:45 +0200 Subject: [PATCH 1/5] :%s/Related manpages/Related documentation/g Signed-off-by: Nico Schottelius --- doc/man/cdist-stages.text | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/man/cdist-stages.text b/doc/man/cdist-stages.text index 465a7fc8..279e1d5f 100644 --- a/doc/man/cdist-stages.text +++ b/doc/man/cdist-stages.text @@ -23,7 +23,7 @@ Before running the user facing stages, cdist prepares the target host to contain cdist binaries and creates a clean environment for the configuration run. -Related manpages: +Related documentation: - cdist-bin-transfer(1) FIXME: does not exist @@ -34,7 +34,7 @@ explorers. Every existing explorer is run on the target and the output of all explorers are copied back into the local cache. The results can be used by manifests and types. -Related manpages: +Related documentation: - cdist-explorer-run-global(1) - cdist-remote-explorer-run(1) - cdist-explorer(7) @@ -48,7 +48,7 @@ the objects as defined in the manifest for the specific host. In this stage, no conflicts may occur, i.e. no object of the same type with the same id may be created. -Related manpages: +Related documentation: - cdist-manifest-run-init(1) - cdist-manifest-run(1) - cdist-manifest(7) @@ -61,7 +61,7 @@ transfered to the target host and executed. The results are transfered back and can be used in the following stages to decide what changes need to made on the target to implement the desired state. -Related manpages: +Related documentation: - cdist-object-explorer-run(1) - cdist-remote-explorer-run(1) - cdist-type(7) @@ -82,7 +82,7 @@ The newly created objects are merged back into the existing tree. No conflicts may occur during the merge. A conflict would mean that two different objects try to create the same object, which indicates a broken configuration. -Related manpages: +Related documentation: - cdist-object-manifest-run(1) - cdist-manifest-run(1) - cdist-type(7) @@ -96,7 +96,7 @@ be executed. This executable should create code to be executed on the target on stdout. If the gencode executable fails, it must print diagnostic messages on stderr and exit non-zero. -Related manpages: +Related documentation: - cdist-object-gencode-run(1) - cdist-object-gencode(1) - cdist-type(7) @@ -107,7 +107,7 @@ STAGE 6: CODE EXECUTION For every object the resulting code from the previous stage is transferred to the target host and executed there to apply the configuration changes. -Related manpages: +Related documentation: - cdist-object-code-run(1) - cdist-code-run(1) @@ -116,7 +116,7 @@ STAGE 7: CACHE -------------- The cache stores the information from the current run for later use. -Related manpages: +Related documentation: - cdist-cache(1) From e2e4936103379d6e25de2198a633b6bc8ae9bfca Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:24:13 +0200 Subject: [PATCH 2/5] -FIXME in doc/man/cdist-stages.text Signed-off-by: Nico Schottelius --- doc/man/cdist-stages.text | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man/cdist-stages.text b/doc/man/cdist-stages.text index 279e1d5f..6ac6efe2 100644 --- a/doc/man/cdist-stages.text +++ b/doc/man/cdist-stages.text @@ -24,7 +24,7 @@ to contain cdist binaries and creates a clean environment for the configuration run. Related documentation: - - cdist-bin-transfer(1) FIXME: does not exist + - Source of cdist-deploy-to STAGE 1: TARGET INFORMATION RETRIEVAL From ad7a9f82f77526a2c52b30447686ecf6391cd6e3 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:27:57 +0200 Subject: [PATCH 3/5] __cdist_objects_created == local output Signed-off-by: Nico Schottelius --- bin/cdist-config | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/cdist-config b/bin/cdist-config index 19c127d4..1882d1bb 100755 --- a/bin/cdist-config +++ b/bin/cdist-config @@ -122,6 +122,8 @@ __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX") : ${__cdist_out_type_dir:=$__cdist_out_dir/$__cdist_name_type} : ${__cdist_out_type_bin_dir:=$__cdist_out_dir/$__cdist_name_type_bin} +: ${__cdist_objects_created:=$__cdist_out_object_dir/$__cdist_name_objects_created} + ################################################################################ # Remote base # @@ -139,10 +141,6 @@ __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX") : ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer} : ${__cdist_remote_out_object_dir:=$__cdist_remote_out_dir/$__cdist_name_object} -################################################################################ -# Global internal variables -# -: ${__cdist_objects_created:=$__cdist_out_object_dir/$__cdist_name_objects_created} ################################################################################ # Internal functions From 6be9d02e6a8f588d4b40ef0fdf01743d8f9736cc Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:28:59 +0200 Subject: [PATCH 4/5] consistency: function {} begin on next line Signed-off-by: Nico Schottelius --- bin/cdist-config | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/cdist-config b/bin/cdist-config index 1882d1bb..531f709c 100755 --- a/bin/cdist-config +++ b/bin/cdist-config @@ -185,11 +185,13 @@ __cdist_init_deploy() ln -sf "$__cdist_conf_dir" "$__cdist_local_base_dir/$__cdist_name_conf_dir" } -__cdist_new_objects_created() { +__cdist_new_objects_created() +{ touch "$__cdist_tmp_dir/object_created" } -__cdist_has_new_objects() { +__cdist_has_new_objects() +{ touch "$__cdist_tmp_dir/object_created" } @@ -267,7 +269,6 @@ __cdist_object_type_explorer_dir() echo "$(__cdist_object_dir "$1")/${__cdist_name_explorer}" } - ################################################################################ # Remote # From 0422eda599f51916c9c7d3cbd213b818d00c62e0 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:33:09 +0200 Subject: [PATCH 5/5] WARNING: WHITESPACE-NAZI Signed-off-by: Nico Schottelius --- doc/dev/todo/TAKEME | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME index 138f7714..e63d3dfb 100644 --- a/doc/dev/todo/TAKEME +++ b/doc/dev/todo/TAKEME @@ -17,5 +17,3 @@ Types to be written/extended: - regexp replace (can probably cover all?) -> aka sed. - __cron - -