forked from ungleich-public/cdist
fix merge conflict in changelog
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong
commit
59e774b08d
43 changed files with 916 additions and 480 deletions
|
|
@ -1,10 +1,19 @@
|
|||
1.0.4:
|
||||
1.1.0: 2011-03-16
|
||||
* Replace type __file with __file, __directory, __link
|
||||
* Document cdist-env
|
||||
* Document cdist-config
|
||||
* Document cdist-dir
|
||||
* Document cdist-quickstart
|
||||
|
||||
1.0.4: 2011-03-15
|
||||
* New type __motd
|
||||
* New type __addifnosuchline
|
||||
* New type __addifnosuchline (Daniel Roth)
|
||||
* Document type __issue
|
||||
* New type __user
|
||||
* Document type __package
|
||||
* Document type __package_emerge
|
||||
* Document type __package_pacman
|
||||
* Document type __package_apt
|
||||
* New parameter for __file: --owner and --group
|
||||
|
||||
1.0.3: 2011-03-11
|
||||
* Update regexp used for sane characters
|
||||
|
|
|
|||
27
doc/dev/logs/2011-03-15
Normal file
27
doc/dev/logs/2011-03-15
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
Steven, Nico
|
||||
|
||||
How to handle dependencies:
|
||||
|
||||
1) Add --require parameter for all types
|
||||
- Special handling in cdist-type-emulator
|
||||
+ Everything on one line
|
||||
|
||||
2) Add __require type
|
||||
+ No change in core
|
||||
- Type influences core
|
||||
- Additional line
|
||||
- Core needs to know about requirements
|
||||
|
||||
3) cdist-require as a seperate executable
|
||||
+ No change in cdist-type-emulator
|
||||
- new behaviour
|
||||
- first time cdist-xxx dependency in types
|
||||
|
||||
4) require="" environment variable for cdist-type-emulator
|
||||
+ on one line / same context
|
||||
+ special handling is ok for special case
|
||||
+ doesn't touch parameters (i.e. type still has full control)
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
Result: Use version 4.
|
||||
7
doc/dev/logs/2011-03-15.file_directory_link
Normal file
7
doc/dev/logs/2011-03-15.file_directory_link
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
Proposal for new types, which replace __file:
|
||||
|
||||
x __directory /etc [--mode --owner --group --parents [yes|no] ]
|
||||
|
||||
x __link /destination --source abc --type [symbolic|hard]
|
||||
|
||||
x __file /etc/passwd [--source] --mode --owner --group
|
||||
|
|
@ -0,0 +1 @@
|
|||
Release 1.1.0
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
Core:
|
||||
- write test case: test.sh
|
||||
- probably remove grep -q (solaris does not have it)
|
||||
|
||||
Dependencies:
|
||||
- Add meta parameters like --requires --excludes --depends?
|
||||
- Build dependency tree
|
||||
|
|
@ -9,22 +13,9 @@ Types to be written/extended:
|
|||
- __service
|
||||
- __user
|
||||
- __file_edit
|
||||
- delete_line_from_file
|
||||
- __deleteline
|
||||
- regexp replace (can probably cover all?)
|
||||
- __file:
|
||||
- template == [shell script] stdout
|
||||
- cron
|
||||
- __file: think about splitting
|
||||
__file
|
||||
source
|
||||
mode
|
||||
owner
|
||||
__directory
|
||||
parents
|
||||
mode
|
||||
owner
|
||||
__link
|
||||
type symbolic | hard
|
||||
- __issue: add --source
|
||||
|
||||
|
||||
|
|
@ -41,16 +32,8 @@ Documentation:
|
|||
+ cdist
|
||||
+ cdist-deploy-to
|
||||
+ cdist-manifest
|
||||
- cdist-type [IMPORTANT]
|
||||
- only do necessary work [TYPE IMPLEMENTATION HINTS]
|
||||
- install packages only if not existent
|
||||
- copy file only if different
|
||||
- DOC document that $type/manifest is executed for every object/instance
|
||||
- ensure every file in bin/ has a correspondent manpage
|
||||
- cdist-code-run-all
|
||||
- cdist-config
|
||||
- cdist-deploy-to
|
||||
- cdist-dir
|
||||
- cdist-explorer-run-init
|
||||
- cdist-manifest-run
|
||||
- cdist-manifest-run-all
|
||||
|
|
@ -58,7 +41,6 @@ Documentation:
|
|||
- cdist-object-codegen
|
||||
- cdist-object-codegen-all
|
||||
- cdist-object-explorer-all
|
||||
- cdist-quickstart
|
||||
- cdist-remote-code-run-all
|
||||
- cdist-remote-explorer-run
|
||||
- cdist-run-remote
|
||||
|
|
@ -10,18 +10,14 @@ cdist-config - Read basic cdist configuration
|
|||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Cdist-config is sourced by all helper programs and provides
|
||||
hints on where to find the library. Cdist-config needs to be
|
||||
in the path.
|
||||
|
||||
AUTHOR
|
||||
------
|
||||
Nico Schottelius <mailto:nico-cdist--@--schottelius.org[]>
|
||||
Cdist-config is sourced by cdist programs and provides hints on where to find
|
||||
types, manifests, etc. Generally speaking, it's just usable from within the
|
||||
core and is only of interest for cdist-developers.
|
||||
|
||||
|
||||
RESOURCES
|
||||
---------
|
||||
Main web site: http://www.nico.schottelius.org/cdist/[]
|
||||
SEE ALSO
|
||||
--------
|
||||
cdist(7)
|
||||
|
||||
|
||||
COPYING
|
||||
38
doc/man/cdist-dir.text
Normal file
38
doc/man/cdist-dir.text
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
cdist-dir(1)
|
||||
============
|
||||
Nico Schottelius <nico-cdist--@--schottelius.org>
|
||||
|
||||
|
||||
NAME
|
||||
----
|
||||
cdist-dir - Poor man's directory synchronisation
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
cdist-dir <push|pull> TARGET_HOST SRC_DIR DST_DIR
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
cdist-dir either pushes a local directory to the target host
|
||||
or pulls a remote directory from a target host to the local host.
|
||||
|
||||
In the push case SRC_DIR is local, in the pull case remote.
|
||||
In the push case DST_DIR is remote, in the pull case local.
|
||||
|
||||
cdist-dir does not cleanup DST_DIR and thus it may contain old
|
||||
stuff if used multiple times.
|
||||
|
||||
cdist-dir does not rely on rsync or other high level tools, because
|
||||
it cannot expect its existence on the local or target host.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
cdist(7)
|
||||
|
||||
|
||||
COPYING
|
||||
-------
|
||||
Copyright \(C) 2011 Nico Schottelius. Free use of this software is
|
||||
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
||||
46
doc/man/cdist-env.text
Normal file
46
doc/man/cdist-env.text
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
cdist-env(1)
|
||||
============
|
||||
Nico Schottelius <nico-cdist--@--schottelius.org>
|
||||
|
||||
|
||||
NAME
|
||||
----
|
||||
cdist-env - Setup environment for using cdist
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
cdist-env
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
cdist-env outputs two strings suitable for usage in your current shell,
|
||||
so you can use cdist from the checkout. cdist-env essentially helps you
|
||||
to easily setup PATH and MANPATH.
|
||||
|
||||
If you've multiple checkouts of cdist and run cdist-env from the various
|
||||
checkouts, a new run will prepend the last directory, thus ensures you
|
||||
can run it multiple times and does what one expects.
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
For use in bourne shell variants (like dash, bash, ksh) as well as
|
||||
in csh variants (csh, tcsh):
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
eval `./bin/cdist-env`
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
Replace "./" with the checkout directory of cdist.
|
||||
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
cdist(7)
|
||||
|
||||
|
||||
COPYING
|
||||
-------
|
||||
Copyright \(C) 2011 Nico Schottelius. Free use of this software is
|
||||
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
||||
51
doc/man/cdist-quickstart.text
Normal file
51
doc/man/cdist-quickstart.text
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
cdist-quickstart(1)
|
||||
===================
|
||||
Nico Schottelius <nico-cdist--@--schottelius.org>
|
||||
|
||||
NAME
|
||||
----
|
||||
cdist-quickstart - Make use of cinit in 5 minutes
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
cdist-quickstart
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
cdist-quickstart is an interactive guide to cdist. It should be one
|
||||
of the first tools you use when you begin with cdist.
|
||||
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
|
||||
To use cdist-quickstart, add the bin directory to your PATH,
|
||||
execute cdist-quickstart and enjoy cdist:
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
# Bourne shell example
|
||||
export PATH=$(pwd -P)/bin:$PATH
|
||||
|
||||
# Alternatively, usable for csh and bsh, set's up PATH and MANPATH
|
||||
eval `./bin/cdist-env`
|
||||
|
||||
# Let's go!
|
||||
cdist-quickstart
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
- cdist(7)
|
||||
- cdist-env(1)
|
||||
|
||||
|
||||
COPYING
|
||||
-------
|
||||
Copyright \(C) 2010-2011 Nico Schottelius. Free use of this software is
|
||||
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
||||
## How to use cdist?
|
||||
|
|
@ -179,6 +179,14 @@ level tools like ruby installed. If a type requires specific tools to be present
|
|||
on the target, there must be another type that provides this tool and the first
|
||||
type should create an object of the specific type.
|
||||
|
||||
If your type wants to save temporay data, that may be used by other types
|
||||
later on (for instance __file), you can save them in the subdirectory
|
||||
"files" below $__object (but you must create it yourself). cdist will not touch
|
||||
this directory.
|
||||
|
||||
If your type contains static files, it's also recommened to place them in
|
||||
a folder named "files" within the type (again, because cdist guarantees to
|
||||
never ever touch this folder).
|
||||
|
||||
HOW TO INCLUDE A TYPE INTO UPSTREAM CDIST
|
||||
-----------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
cdist-quickstart(1)
|
||||
===================
|
||||
Nico Schottelius <nico-cdist--@--schottelius.org>
|
||||
|
||||
NAME
|
||||
----
|
||||
cdist-quickstart - Make use of cinit in 5 minutes
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This document helps you to take the first steps with cdist.
|
||||
We'll begin to configure the host "localhost" to have two files
|
||||
in place, /etc/DO-NOT-CHANGE and /root/CDIST-ENABLED-HOST, which
|
||||
both are used to warn other sysadmins that this system is managed
|
||||
by configuration management and manual changes may get overwritten.
|
||||
|
||||
Begin to execute cdist-quickstart, it will show you the steps it
|
||||
takes and explains what it does:
|
||||
|
||||
% cdist-quickstart
|
||||
|
||||
mkdir -p /etc/cdist/manifests
|
||||
|
||||
# Create
|
||||
|
||||
Cdist uses
|
||||
kgives you an impression of
|
||||
0. Create a host specification (/etc/cdist/hosts/**hostname**)
|
||||
0. Add functionalilty to add
|
||||
0. Run ***cdist-apply***
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
cdist-config-layout(7)
|
||||
|
||||
|
||||
COPYING
|
||||
-------
|
||||
Copyright \(C) 2010-2011 Nico Schottelius. Free use of this software is
|
||||
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
||||
## How to use cdist?
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
cdist-terms(7)
|
||||
==============
|
||||
Nico Schottelius <nico-cdist--@--schottelius.org>
|
||||
|
||||
|
||||
NAME
|
||||
----
|
||||
cdist-terms - Describe terms used in cdist
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
provider: Provides functionality.
|
||||
object: Instance with provider unique id of a provider.
|
||||
manifest: Define which objects to create [on hosts]
|
||||
server: The machine that configures all targets.
|
||||
target: Host that should be configured.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
|
||||
|
||||
COPYING
|
||||
-------
|
||||
Copyright \(C) 2010-2011 Nico Schottelius. Free use of this software is
|
||||
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
cdist-type-addifnosuchline(1)
|
||||
======================
|
||||
Daniel Roth <dani-cdist--@--d-roth.li>
|
||||
|
||||
|
||||
NAME
|
||||
----
|
||||
cdist-type-addifnosuchline
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
cdist-type-addifnosuchline Add if no such line
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
cdist-type-addifnosuchline can be used to check a file for existence of a
|
||||
specific line and adding that if not found
|
||||
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
cdist(7)
|
||||
|
||||
|
||||
COPYING
|
||||
-------
|
||||
Copyright \(C) 2011 Daniel Roth. Free use of this software is
|
||||
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
cdist-type-manifest(7)
|
||||
======================
|
||||
Nico Schottelius <nico-cdist--@--schottelius.org>
|
||||
|
||||
|
||||
NAME
|
||||
----
|
||||
cdist-type-manifest - Manifest of a type
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
CWD = object directory
|
||||
ARGV = target host, basedir
|
||||
ENV =
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
|
||||
|
||||
COPYING
|
||||
-------
|
||||
Copyright \(C) 2010-2011 Nico Schottelius. Free use of this software is
|
||||
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
||||
Loading…
Add table
Add a link
Reference in a new issue