fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

doc and doc building update

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-11-15 14:33:08 +01:00
parent c51edff9f5
commit 5ffd523340
3 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
build
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2011 Nico Schottelius (nico-cdist at schottelius.org) # 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -34,9 +34,10 @@ A2XM="a2x -f manpage --no-xmllint -a encoding=UTF-8"
A2XH="a2x -f xhtml --no-xmllint -a encoding=UTF-8" A2XH="a2x -f xhtml --no-xmllint -a encoding=UTF-8"
# Developer webbase # Developer webbase
WEBDIR=$HOME/niconetz WEBDIR=$HOME/www.nico.schottelius.org
WEBBLOG=$WEBDIR/blog WEBBLOG=$WEBDIR/blog
WEBBASE=$WEBDIR/software/cdist WEBTOPDIR=$WEBDIR/software
WEBBASE=$WEBTOPDIR/cdist
WEBMAN=$WEBBASE/man/$version WEBMAN=$WEBBASE/man/$version
WEBPAGE=${WEBBASE}.mdwn WEBPAGE=${WEBBASE}.mdwn
@ -89,6 +90,13 @@ case "$1" in
${MANDIR}/cdist-reference.text.sh ${MANDIR}/cdist-reference.text.sh
;; ;;
man-pub)
rm -rf "${WEBMAN}"
mkdir -p "${WEBMAN}/man1" "${WEBMAN}/man7"
cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${WEBMAN}/man1
cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${WEBMAN}/man7
;;
dist) dist)
set -e set -e
# Do the checks # Do the checks
@ -314,23 +322,15 @@ eof
done done
;; ;;
webmain)
cp README ${WEBPAGE}
cd ${WEBDIR} && git commit -m "cdist main update" ${WEBPAGE}
cd ${WEBDIR} && make pub
;;
web) web)
cp README ${WEBPAGE} set -e
rm -rf ${WEBMAN} rsync -av "${basedir}/docs/web/" "${WEBTOPDIR}"
mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7
cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${WEBMAN}/man1 $0 man-pub
cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${WEBMAN}/man7
cd "${WEBDIR}" && git add "${WEBBASE}"
cd ${WEBDIR} && git add ${WEBBASE} cd "${WEBDIR}" && git commit -m "cdist update" "${WEBBASE}" "${WEBPAGE}"
cd ${WEBDIR} && git commit -m "cdist update" ${WEBBASE} ${WEBPAGE} cd "${WEBDIR}" && make pub
cd ${WEBDIR} && make pub
# Fix ikiwiki, which does not like symlinks for pseudo security # Fix ikiwiki, which does not like symlinks for pseudo security
ssh tee.schottelius.org \ ssh tee.schottelius.org \

6
docs/web/cdist/documentation.mdwn
View file

@ -1,5 +1,7 @@
[[!meta title="Documentation"]]
* [Latest documentation](man/latest) You can browse the latest
* [All versions](man) [latest version of the manpages](man/latest) or
have a look at [all versions](man).
[[!tag cdist unix]] [[!tag cdist unix]]

16
docs/web/cdist/update.mdwn
View file

@ -24,18 +24,20 @@ To upgrade to the lastet version do
### Updating from 2.0 to 2.1 ### Updating from 2.0 to 2.1
* Type __package* and __process use --state **present** or **absent**. * Type **\_\_package* and \_\_process** use --state **present** or **absent**.
The states **removed/installed** and **stopped/running** have been removed. The states **removed/installed** and **stopped/running** have been removed.
Support for the new states is already present in 2.0. Support for the new states is already present in 2.0.
* Type __directory: Parameter --parents and --recursive are now boolean * Type **\_\_directory**: Parameter --parents and --recursive are now boolean
and the old "yes/no" values need to be removed The old "yes/no" values need to be removed.
* Type **__addifnosuchline** and **__removeline** have been replaced by **__line** * Type **\_\_rvm_ruby**: Parameter --default is now boolean
The old "yes/no" values need to be removed.
* Type **\_\_addifnosuchline** and **\_\_removeline** have been replaced by **\_\_line**
* The **conf** directory is now located at **cdist/conf**. * The **conf** directory is now located at **cdist/conf**.
You need to migrate your types, explorers and manifests You need to migrate your types, explorers and manifests
manually to the new location. manually to the new location.
* Replace the variable **__self** by **__object_name** * Replace the variable **\_\_self** by **\_\_object_name**
Support for the variable **__object_name** is already present in 2.0. Support for the variable **\_\_object_name** is already present in 2.0.
* The types __autofs, __autofs_map and __autofs_reload have been removed * The types **\_\_autofs**, **\_\_autofs_map** and **\_\_autofs_reload** have been removed
(no maintainer, no users) (no maintainer, no users)