andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

import latest changes from private repo

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2012-01-09 10:51:53 +01:00
parent 8c1aa87296
commit 2e61f54c11
5 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/type/__directory/gencode-remote
View file

@ -17,12 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
#
# Handle directories
#
#
# __directory /etc [--mode --owner --group --parents [yes|no] ]
#
destination="/$__object_id" destination="/$__object_id"
state_should="$(cat "$__object/parameter/state")" state_should="$(cat "$__object/parameter/state")"

8
conf/type/__directory/manifest
View file

@ -18,8 +18,6 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
if [ -f "$__object/parameter/state" ]; then # set defaults
state="$(cat "$__object/parameter/state")" state="$(cat "$__object/parameter/state" 2>/dev/null \
else || echo "present" | tee "$__object/parameter/state")"
echo "present" > "$__object/parameter/state"
fi

6
conf/type/__file/gencode-local
View file

@ -33,11 +33,7 @@ if [ "$state_should" = "present" ]; then
remote_cksum="$(cat "$__object/explorer/cksum")" remote_cksum="$(cat "$__object/explorer/cksum")"
if [ "$local_cksum" != "$remote_cksum" ]; then if [ "$local_cksum" != "$remote_cksum" ]; then
# FIXME: The username is ugly and hardcoded, replace after 1.0! echo "$__remote_copy" "$source" "${__target_host}:${destination}"
# Probably a better aproach is to have the user configured
# ~/.ssh/config to contain the right username
# Probably describe it in cdist-quickstart...
echo scp "$source" "root@${__target_host}:${destination}"
fi fi
else else
echo "Source \"$source\" does not exist." >&2 echo "Source \"$source\" does not exist." >&2

8
conf/type/__file/manifest
View file

@ -20,8 +20,6 @@
name="$__object_id" name="$__object_id"
if [ -f "$__object/parameter/state" ]; then # set defaults
state="$(cat "$__object/parameter/state")" state="$(cat "$__object/parameter/state" 2>/dev/null \
else || echo "present" | tee "$__object/parameter/state")"
echo "present" > "$__object/parameter/state"
fi

8
conf/type/__link/manifest
View file

@ -18,8 +18,6 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
if [ -f "$__object/parameter/state" ]; then # set defaults
state="$(cat "$__object/parameter/state")" state="$(cat "$__object/parameter/state" 2>/dev/null \
else || echo "present" | tee "$__object/parameter/state")"
echo "present" > "$__object/parameter/state"
fi