From 0da3483223e24edfbbba1e434c50aa79055dd3a3 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 19 Feb 2011 00:01:39 +0100 Subject: [PATCH] begin to cleanup stages document Signed-off-by: Nico Schottelius --- conf/manifests/init | 8 ++++++++ conf/types/__file/cdist_dir.sh | 28 --------------------------- conf/types/__file/parameters/optional | 2 ++ conf/types/__file/parameters/required | 2 -- doc/man/cdist-stages.text | 8 ++++---- 5 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 conf/types/__file/cdist_dir.sh diff --git a/conf/manifests/init b/conf/manifests/init index 748b5dc2..8c090547 100755 --- a/conf/manifests/init +++ b/conf/manifests/init @@ -10,4 +10,12 @@ case "$__cdist_target_host" in --type file __issue iddoesnotmatterhere ;; + + tee.schottelius.org) + __package qemu-kvm --wtf installed + ;; + + katze*) + __package qemu-kvm --wtf installed + ;; esac diff --git a/conf/types/__file/cdist_dir.sh b/conf/types/__file/cdist_dir.sh deleted file mode 100644 index aa4c4c49..00000000 --- a/conf/types/__file/cdist_dir.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# 2010 Nico Schottelius (nico-cdist at schottelius.org) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# - -cdist_dir() -{ - dst="$1"; shift - - # FIXME later: ownership, permissions, recursive - mkdir "${dst}" -} diff --git a/conf/types/__file/parameters/optional b/conf/types/__file/parameters/optional index 17ab372f..de17ffff 100644 --- a/conf/types/__file/parameters/optional +++ b/conf/types/__file/parameters/optional @@ -1 +1,3 @@ mode +source +destination diff --git a/conf/types/__file/parameters/required b/conf/types/__file/parameters/required index 14592dcb..aa80e646 100644 --- a/conf/types/__file/parameters/required +++ b/conf/types/__file/parameters/required @@ -1,3 +1 @@ -source -destination type diff --git a/doc/man/cdist-stages.text b/doc/man/cdist-stages.text index bf7ac1ec..b48fcb44 100644 --- a/doc/man/cdist-stages.text +++ b/doc/man/cdist-stages.text @@ -14,10 +14,10 @@ Starting the execution of deployment with cdist-deploy-to(1), cdist passes through different stages: - First stage: Get information about target - Every existing explorer (see cdist-explorers(7) is run on - the target and the results are copied back into the local - cache (see cdist-cache(7)). These values can be used by - manifests and types. + Every existing explorer is run on the target and the results + are copied back into the local cache. + The results can be used by manifests and types. + See cdist-explorers(7) and see cdist-cache(7). - Second stage: Initial manifest run The initial manifest (see cdist-manifests(7) is run,