Merge remote branch 'nico/master'
This commit is contained in:
		
				commit
				
					
						19ddd092eb
					
				
			
		
					 12 changed files with 31 additions and 26 deletions
				
			
		
							
								
								
									
										3
									
								
								README
									
										
									
									
									
								
							
							
						
						
									
										3
									
								
								README
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -144,7 +144,8 @@ may vanish at any point. To select a specific branch use
 | 
			
		|||
    git checkout -b <name> origin/<name>
 | 
			
		||||
    
 | 
			
		||||
    # Stay on a specific version
 | 
			
		||||
    git checkout -b 1.4 origin/1.4
 | 
			
		||||
    version=1.5
 | 
			
		||||
    git checkout -b $version origin/$version
 | 
			
		||||
 | 
			
		||||
### Mirrors
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										7
									
								
								build.sh
									
										
									
									
									
								
							
							
						
						
									
										7
									
								
								build.sh
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -23,6 +23,9 @@
 | 
			
		|||
# Pull a directory from a target, both sides have the same name (i.e. explorers)
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
# exit on any error
 | 
			
		||||
set -e
 | 
			
		||||
 | 
			
		||||
# Manpage and HTML
 | 
			
		||||
A2XM="a2x -f manpage --no-xmllint"
 | 
			
		||||
A2XH="a2x -f xhtml --no-xmllint"
 | 
			
		||||
| 
						 | 
				
			
			@ -96,6 +99,10 @@ case "$1" in
 | 
			
		|||
      ${MANDIR}/cdist-reference.text.sh
 | 
			
		||||
   ;;
 | 
			
		||||
 | 
			
		||||
   release)
 | 
			
		||||
      "$0" clean && "$0" man && "$0" web
 | 
			
		||||
   ;;
 | 
			
		||||
 | 
			
		||||
   web)
 | 
			
		||||
      cp README ${WEBDIR}/${WEBPAGE}
 | 
			
		||||
      rm -rf ${WEBDIR}/${WEBBASE}/man && mkdir ${WEBDIR}/${WEBBASE}/man
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -21,3 +21,14 @@ DOCUMENTATION
 | 
			
		|||
--------------
 | 
			
		||||
- asciidoc interprets __, which we use for variables
 | 
			
		||||
  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!
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,11 +1 @@
 | 
			
		|||
/ prefix all internal variables with __cdist! -> Nico
 | 
			
		||||
 | 
			
		||||
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!
 | 
			
		||||
Release 1.5.0 correctly :-)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,6 @@
 | 
			
		|||
cdist-object-code-run(1)
 | 
			
		||||
========================
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>
 | 
			
		||||
Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
NAME
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,6 @@
 | 
			
		|||
cdist-object-explorer-run(1)
 | 
			
		||||
============================
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>
 | 
			
		||||
Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
NAME
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,6 @@
 | 
			
		|||
cdist-object-gencode-run(1)
 | 
			
		||||
===========================
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>
 | 
			
		||||
Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
NAME
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,6 @@
 | 
			
		|||
cdist-object-push(1)
 | 
			
		||||
====================
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>
 | 
			
		||||
Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
NAME
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,6 @@
 | 
			
		|||
cdist-object-run-all(1)
 | 
			
		||||
=======================
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>
 | 
			
		||||
Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
NAME
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,6 @@
 | 
			
		|||
cdist-object-run(1)
 | 
			
		||||
===================
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>
 | 
			
		||||
Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
NAME
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -166,6 +166,9 @@ __object::
 | 
			
		|||
__object_id::
 | 
			
		||||
   The type unique object id.
 | 
			
		||||
   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::
 | 
			
		||||
   The host we are deploying to.
 | 
			
		||||
   Available for: initial manifest, type manifest, type codegen
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,6 @@
 | 
			
		|||
cdist-stages(7)
 | 
			
		||||
===============
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>
 | 
			
		||||
Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
Nico Schottelius <nico-cdist--@--schottelius.org>, Steven Armstrong <steven-dist--@--armstrong.cc>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
NAME
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue