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

Merge remote branch 'nico/master'

Browse source
This commit is contained in:
Steven Armstrong 2011-03-29 17:10:35 +02:00
commit 19ddd092eb
12 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README
View file

@ -144,7 +144,8 @@ may vanish at any point. To select a specific branch use
git checkout -b <name> origin/<name> git checkout -b <name> origin/<name>
# Stay on a specific version # Stay on a specific version
git checkout -b 1.4 origin/1.4 version=1.5
git checkout -b $version origin/$version
### Mirrors ### Mirrors

7
build.sh
View file

@ -23,6 +23,9 @@
# Pull a directory from a target, both sides have the same name (i.e. explorers) # Pull a directory from a target, both sides have the same name (i.e. explorers)
# #
# exit on any error
set -e
# Manpage and HTML # Manpage and HTML
A2XM="a2x -f manpage --no-xmllint" A2XM="a2x -f manpage --no-xmllint"
A2XH="a2x -f xhtml --no-xmllint" A2XH="a2x -f xhtml --no-xmllint"
@ -96,6 +99,10 @@ case "$1" in
${MANDIR}/cdist-reference.text.sh ${MANDIR}/cdist-reference.text.sh
;; ;;
release)
"$0" clean && "$0" man && "$0" web
;;
web) web)
cp README ${WEBDIR}/${WEBPAGE} cp README ${WEBDIR}/${WEBPAGE}
rm -rf ${WEBDIR}/${WEBBASE}/man && mkdir ${WEBDIR}/${WEBBASE}/man rm -rf ${WEBDIR}/${WEBBASE}/man && mkdir ${WEBDIR}/${WEBBASE}/man

11
doc/dev/todo/TAKEME
View file

@ -21,3 +21,14 @@ DOCUMENTATION
-------------- --------------
- asciidoc interprets __, which we use for variables - asciidoc interprets __, which we use for variables
names -> seek through docs and replace with \_\_! names -> seek through docs and replace with \_\_!
- check all all internal variables are prefixed with __cdist
Cache:
- add example how to use
- export variable $__cache
-> for current host
-> add function to cdist-config, import from cdist-cache
remove --preseed from package_apt and add debconf_set_selection or similar
-> much cleaner!

12
doc/dev/todo/niconext
View file

@ -1,11 +1 @@
/ prefix all internal variables with __cdist! -> Nico Release 1.5.0 correctly :-)
Cache:
- add example how to use
- export variable $__cache
-> for current host
-> add function to cdist-config, import from cdist-cache
remove --preseed from package_apt and add debconf_set_selection or similar
-> much cleaner!

3
doc/man/cdist-object-code-run.text
View file

@ -1,7 +1,6 @@
cdist-object-code-run(1) cdist-object-code-run(1)
======================== ========================
Nico Schottelius <nico-cdist--@--schottelius.org> Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
Steven Armstrong <steven-dist--@--armstrong.cc>
NAME NAME

3
doc/man/cdist-object-explorer-run.text
View file

@ -1,7 +1,6 @@
cdist-object-explorer-run(1) cdist-object-explorer-run(1)
============================ ============================
Nico Schottelius <nico-cdist--@--schottelius.org> Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
Steven Armstrong <steven-dist--@--armstrong.cc>
NAME NAME

3
doc/man/cdist-object-gencode-run.text
View file

@ -1,7 +1,6 @@
cdist-object-gencode-run(1) cdist-object-gencode-run(1)
=========================== ===========================
Nico Schottelius <nico-cdist--@--schottelius.org> Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
Steven Armstrong <steven-dist--@--armstrong.cc>
NAME NAME

3
doc/man/cdist-object-push.text
View file

@ -1,7 +1,6 @@
cdist-object-push(1) cdist-object-push(1)
==================== ====================
Nico Schottelius <nico-cdist--@--schottelius.org> Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
Steven Armstrong <steven-dist--@--armstrong.cc>
NAME NAME

3
doc/man/cdist-object-run-all.text
View file

@ -1,7 +1,6 @@
cdist-object-run-all(1) cdist-object-run-all(1)
======================= =======================
Nico Schottelius <nico-cdist--@--schottelius.org> Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
Steven Armstrong <steven-dist--@--armstrong.cc>
NAME NAME

3
doc/man/cdist-object-run.text
View file

@ -1,7 +1,6 @@
cdist-object-run(1) cdist-object-run(1)
=================== ===================
Nico Schottelius <nico-cdist--@--schottelius.org> Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
Steven Armstrong <steven-dist--@--armstrong.cc>
NAME NAME

3
doc/man/cdist-reference.text.sh
View file

@ -166,6 +166,9 @@ __object::
__object_id:: __object_id::
The type unique object id. The type unique object id.
Available for: type manifest, type explorer, type codegen Available for: type manifest, type explorer, type codegen
__self::
The full qualified name of the current object.
Available for: type manifest, type explorer, type codegen
__target_host:: __target_host::
The host we are deploying to. The host we are deploying to.
Available for: initial manifest, type manifest, type codegen Available for: initial manifest, type manifest, type codegen

3
doc/man/cdist-stages.text
View file

@ -1,7 +1,6 @@
cdist-stages(7) cdist-stages(7)
=============== ===============
Nico Schottelius <nico-cdist--@--schottelius.org> Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
Steven Armstrong <steven-dist--@--armstrong.cc>
NAME NAME