From 70af8c9e50bb99c89150cff0b4e81deaefc25298 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 4 Apr 2011 12:12:05 +0200 Subject: [PATCH] cdist update --- software/cdist.mdwn | 6 ++-- software/cdist/man/cdist-best-practice.html | 32 +++++++++++++++++++-- software/cdist/man/cdist-reference.html | 2 +- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/software/cdist.mdwn b/software/cdist.mdwn index e8f6e0bf..aba67707 100644 --- a/software/cdist.mdwn +++ b/software/cdist.mdwn @@ -31,7 +31,7 @@ Here are some features that makes it unique: Keywords | Description Simplicity | There is only one type to extend cdist called ***type*** Design | Type and core cleanly seperated -Design | cdist sticks completly to the KISS (keep it simple and stupid) paradigma +Design | Sticks completly to the KISS (keep it simple and stupid) paradigma Design | Meaningful error messages - do not lose time debugging error messages Design | Consistency in behaviour, naming and documentation Design | No surprise factor: Only do what is obviously clear, no magic @@ -40,8 +40,8 @@ Small core | cdist's core is very small - less code, less bugs Fast development | Focus on straightforwardness of type creation is a main development objective Requirements, Scalability | No central server needed, cdist operates in push mode and can be run from any computer Requirements, Scalability, Upgrade | cdist only needs to be updated on the master, not on the target hosts -Requirements | cdist requires only SSH and a shell on the target -Requirements | +Requirements, Security | Uses well-know [SSH](http://www.openssh.com/) as transport protocol +Requirements, Simplicity | Requires only shell and SSH server on the target UNIX | Reuse of existing tools like cat, find, mv, ... UNIX, familar environment, documentation | Is available as manpages and HTML UNIX, simplicity, familar environment | cdist is written in POSIX shell diff --git a/software/cdist/man/cdist-best-practice.html b/software/cdist/man/cdist-best-practice.html index 478e4566..f7f3b1f8 100644 --- a/software/cdist/man/cdist-best-practice.html +++ b/software/cdist/man/cdist-best-practice.html @@ -1,6 +1,6 @@ -cdist-best-practice(7)

cdist-best-practice(7)

Nico Schottelius

Table of Contents

1. NAME
2. PASSWORDLESS CONNECTIONS
3. SPEEDING UP SSH CONNECTIONS
4. MULTI MASTER OR ENVIRONMENT SETUPS
5. SEPERATING WORK BY GROUPS
6. MAINTAINING MULTIPLE CONFIGURATIONS
7. SEE ALSO
8. COPYING

1. NAME

cdist-best-practice - Practices used in real environments

2. PASSWORDLESS CONNECTIONS

It is recommended to run cdist with public key authentication. +cdist-best-practice(7)

cdist-best-practice(7)

Table of Contents

1. NAME
2. PASSWORDLESS CONNECTIONS
3. SPEEDING UP SSH CONNECTIONS
4. MULTI MASTER OR ENVIRONMENT SETUPS
5. SEPERATING WORK BY GROUPS
6. MAINTAINING MULTIPLE CONFIGURATIONS
7. SEE ALSO
8. COPYING

1. NAME

cdist-best-practice - Practices used in real environments

2. PASSWORDLESS CONNECTIONS

It is recommended to run cdist with public key authentication. This requires a private/public key pair and the entry "PermitRootLogin without-password" in the sshd server. See sshd_config(5) and ssh-keygen(1).

3. SPEEDING UP SSH CONNECTIONS

When connecting to a new host, the initial delay with ssh connections @@ -50,7 +50,35 @@ git checkout common # change to private and include latest common stuff git checkout private -git merge common

Have a look at git-remote(1) to adjust the remote configuration, which allows +git merge common

The following .git/config is taken from a a real world scenario:

# Track upstream, merge from time to time
+[remote "upstream"]
+   url = git://git.schottelius.org/cdist
+   fetch = +refs/heads/*:refs/remotes/upstream/*
+
+# Same as upstream, but works when being offline
+[remote "local"]
+   fetch = +refs/heads/*:refs/remotes/local/*
+   url = /home/users/nico/p/cdist
+
+# Remote containing various ETH internal branches
+[remote "eth"]
+   url = sans.ethz.ch:/home/services/sans/git/cdist-eth
+   fetch = +refs/heads/*:refs/remotes/eth/*
+
+# Public remote that contains my private changes to cdist upstream
+[remote "nico"]
+   url = git.schottelius.org:/home/services/git/cdist-nico
+   fetch = +refs/heads/*:refs/remotes/nico/*
+
+# The "nico" branch will be synced with the remote nico, branch master
+[branch "nico"]
+   remote = nico
+   merge = refs/heads/master
+
+# ETH stable contains rock solid configurations used in various places
+[branch "eth-stable"]
+   remote = eth
+   merge = refs/heads/stable

Have a look at git-remote(1) to adjust the remote configuration, which allows you to push certain branches to certain remotes.

7. SEE ALSO

  • cdist(7)

8. COPYING

Copyright (C) 2011 Nico Schottelius. Free use of this software is diff --git a/software/cdist/man/cdist-reference.html b/software/cdist/man/cdist-reference.html index 6ea91b86..bc2076c4 100644 --- a/software/cdist/man/cdist-reference.html +++ b/software/cdist/man/cdist-reference.html @@ -1,6 +1,6 @@ -cdist-reference(7)

cdist-reference(7)

Table of Contents

1. NAME
2. DESCRIPTION
3. PATHS
4. TYPES
5. VARIABLES
6. SEE ALSO
7. COPYING

1. NAME

cdist-reference - Variable, path and type reference for cdist

2. DESCRIPTION

Various scripts which are not in the core need information on how +cdist-reference(7)

cdist-reference(7)

Table of Contents

1. NAME
2. DESCRIPTION
3. PATHS
4. TYPES
5. VARIABLES
6. SEE ALSO
7. COPYING

1. NAME

cdist-reference - Variable, path and type reference for cdist

2. DESCRIPTION

Various scripts which are not in the core need information on how to find information. This manpage summarises the available environment variables, types and paths and clearifies with part may access which variables.

3. PATHS

If not specified otherwise, all paths are relative to the checkout directory.

conf/