Fix spelling.
This commit is contained in:
parent
3df61be7b8
commit
2d72c08e9b
13 changed files with 19 additions and 18 deletions
|
@ -11,7 +11,7 @@ DESCRIPTION
|
||||||
Generate and deploy check definitions for a consul agent.
|
Generate and deploy check definitions for a consul agent.
|
||||||
See http://www.consul.io/docs/agent/checks.html for parameter documentation.
|
See http://www.consul.io/docs/agent/checks.html for parameter documentation.
|
||||||
|
|
||||||
Use either script toghether with interval, or use ttl.
|
Use either script together with interval, or use ttl.
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
REQUIRED PARAMETERS
|
||||||
|
|
|
@ -37,7 +37,7 @@ device
|
||||||
| or /dev/mapper/xxxx
|
| or /dev/mapper/xxxx
|
||||||
|
|
||||||
label
|
label
|
||||||
Label which sould apply on the filesystem.
|
Label which should be applied on the filesystem.
|
||||||
|
|
||||||
mkfsoptions
|
mkfsoptions
|
||||||
Additional options which are inserted to the mkfs.xxx call.
|
Additional options which are inserted to the mkfs.xxx call.
|
||||||
|
|
|
@ -2,6 +2,7 @@ Changelog
|
||||||
---------
|
---------
|
||||||
|
|
||||||
next:
|
next:
|
||||||
|
* Documentation: Spelling fixes (Darko Poljak)
|
||||||
* Type __filesystem: Spelling fixes (Dmitry Bogatov)
|
* Type __filesystem: Spelling fixes (Dmitry Bogatov)
|
||||||
* Core: Add target_host file to cache since cache dir name can be hash (Darko Poljak)
|
* Core: Add target_host file to cache since cache dir name can be hash (Darko Poljak)
|
||||||
* Core: Improve hostfile: support comments, skip empty lines (Darko Poljak)
|
* Core: Improve hostfile: support comments, skip empty lines (Darko Poljak)
|
||||||
|
|
|
@ -58,7 +58,7 @@ you can clone it multiple times::
|
||||||
machine-b % git clone git://your-git-server/cdist
|
machine-b % git clone git://your-git-server/cdist
|
||||||
|
|
||||||
|
|
||||||
Seperating work by groups
|
Separating work by groups
|
||||||
-------------------------
|
-------------------------
|
||||||
If you are working with different groups on one cdist-configuration,
|
If you are working with different groups on one cdist-configuration,
|
||||||
you can delegate to other manifests and have the groups edit only
|
you can delegate to other manifests and have the groups edit only
|
||||||
|
|
|
@ -7,7 +7,7 @@ Simplicity
|
||||||
There is only one type to extend cdist called **type**
|
There is only one type to extend cdist called **type**
|
||||||
|
|
||||||
Design
|
Design
|
||||||
+ Type and core cleanly seperated
|
+ Type and core cleanly separated
|
||||||
+ Sticks completly to the KISS (keep it simple and stupid) paradigma
|
+ Sticks completly to the KISS (keep it simple and stupid) paradigma
|
||||||
+ Meaningful error messages - do not lose time debugging error messages
|
+ Meaningful error messages - do not lose time debugging error messages
|
||||||
+ Consistency in behaviour, naming and documentation
|
+ Consistency in behaviour, naming and documentation
|
||||||
|
|
|
@ -56,7 +56,7 @@ or open a pull request at http://github.com/telmich/cdist.
|
||||||
|
|
||||||
How to submit a new type
|
How to submit a new type
|
||||||
------------------------
|
------------------------
|
||||||
For detailled information about types, see `cdist type <cdist-type.html>`_.
|
For detailed information about types, see `cdist type <cdist-type.html>`_.
|
||||||
|
|
||||||
Submitting a type works as described above, with the additional requirement
|
Submitting a type works as described above, with the additional requirement
|
||||||
that a corresponding manpage named man.text in asciidoc format with
|
that a corresponding manpage named man.text in asciidoc format with
|
||||||
|
|
|
@ -118,7 +118,7 @@ On line 4 you can see that the instantion of a type "\__link" object needs
|
||||||
the object "__file/etc/cdist-configured" to be present, before it can proceed.
|
the object "__file/etc/cdist-configured" to be present, before it can proceed.
|
||||||
|
|
||||||
This also means that the "\__link" command must make sure, that either
|
This also means that the "\__link" command must make sure, that either
|
||||||
"\__file/etc/cdist-configured" allready is present, or, if it's not, it needs
|
"\__file/etc/cdist-configured" already is present, or, if it's not, it needs
|
||||||
to be created. The task of cdist is to make sure, that the dependency will be
|
to be created. The task of cdist is to make sure, that the dependency will be
|
||||||
resolved appropriately and thus "\__file/etc/cdist-configured" be created
|
resolved appropriately and thus "\__file/etc/cdist-configured" be created
|
||||||
if necessary before "__link" proceeds (or to abort execution with an error).
|
if necessary before "__link" proceeds (or to abort execution with an error).
|
||||||
|
@ -216,7 +216,7 @@ How to override objects:
|
||||||
|
|
||||||
.. code-block:: sh
|
.. code-block:: sh
|
||||||
|
|
||||||
# for example in the inital manifest
|
# for example in the initial manifest
|
||||||
|
|
||||||
# create user account foobar with some hash for password
|
# create user account foobar with some hash for password
|
||||||
__user foobar --password 'some_fancy_hash' --home /home/foobarexample
|
__user foobar --password 'some_fancy_hash' --home /home/foobarexample
|
||||||
|
|
|
@ -126,7 +126,7 @@ Example: (e.g. in cdist/conf/type/__nginx_vhost/manifest)
|
||||||
# parameter with multiple values
|
# parameter with multiple values
|
||||||
if [ -f "$__object/parameter/server_alias" ]; then
|
if [ -f "$__object/parameter/server_alias" ]; then
|
||||||
for alias in $(cat "$__object/parameter/server_alias"); do
|
for alias in $(cat "$__object/parameter/server_alias"); do
|
||||||
echo $alias > /some/where/usefull
|
echo $alias > /some/where/useful
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ Use `messaging </software/cdist/man/3.0.0/man7/cdist-messaging.html>`_ instead.
|
||||||
Updating from 2.2 to 2.3
|
Updating from 2.2 to 2.3
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
No incompatiblities.
|
No incompatibilities.
|
||||||
|
|
||||||
Updating from 2.1 to 2.2
|
Updating from 2.1 to 2.2
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
@ -164,7 +164,7 @@ Updating from 1.5 to 1.6
|
||||||
Updating from 1.3 to 1.5
|
Updating from 1.3 to 1.5
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
No incompatiblities.
|
No incompatibilities.
|
||||||
|
|
||||||
Updating from 1.2 to 1.3
|
Updating from 1.2 to 1.3
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
@ -174,7 +174,7 @@ Rename **gencode** of every type to **gencode-remote**.
|
||||||
Updating from 1.1 to 1.2
|
Updating from 1.1 to 1.2
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
No incompatiblities.
|
No incompatibilities.
|
||||||
|
|
||||||
Updating from 1.0 to 1.1
|
Updating from 1.0 to 1.1
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
|
@ -207,7 +207,7 @@ CDIST_LOCAL_SHELL
|
||||||
Selects shell for local script execution, defaults to /bin/sh.
|
Selects shell for local script execution, defaults to /bin/sh.
|
||||||
|
|
||||||
CDIST_REMOTE_SHELL
|
CDIST_REMOTE_SHELL
|
||||||
Selects shell for remote scirpt execution, defaults to /bin/sh.
|
Selects shell for remote script execution, defaults to /bin/sh.
|
||||||
|
|
||||||
CDIST_OVERRIDE
|
CDIST_OVERRIDE
|
||||||
Allow overwriting type parameters.
|
Allow overwriting type parameters.
|
||||||
|
|
|
@ -3,7 +3,7 @@ But cdist ticks differently, here is the feature set that makes it unique:
|
||||||
[[!table data="""
|
[[!table data="""
|
||||||
Keywords | Description
|
Keywords | Description
|
||||||
Simplicity | There is only one type to extend cdist called ***type***
|
Simplicity | There is only one type to extend cdist called ***type***
|
||||||
Design | Type and core cleanly seperated
|
Design | Type and core cleanly separated
|
||||||
Design | 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 | Meaningful error messages - do not lose time debugging error messages
|
||||||
Design | Consistency in behaviour, naming and documentation
|
Design | Consistency in behaviour, naming and documentation
|
||||||
|
|
|
@ -67,7 +67,7 @@ Use [messaging](/software/cdist/man/3.0.0/man7/cdist-messaging.html) instead.
|
||||||
|
|
||||||
### Updating from 2.2 to 2.3
|
### Updating from 2.2 to 2.3
|
||||||
|
|
||||||
No incompatiblities.
|
No incompatibilities.
|
||||||
|
|
||||||
### Updating from 2.1 to 2.2
|
### Updating from 2.1 to 2.2
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ Have a look at the update guide for [[2.0 to 2.1|2.0-to-2.1]].
|
||||||
|
|
||||||
### Updating from 1.3 to 1.5
|
### Updating from 1.3 to 1.5
|
||||||
|
|
||||||
No incompatiblities.
|
No incompatibilities.
|
||||||
|
|
||||||
### Updating from 1.2 to 1.3
|
### Updating from 1.2 to 1.3
|
||||||
|
|
||||||
|
@ -142,7 +142,7 @@ Rename **gencode** of every type to **gencode-remote**.
|
||||||
|
|
||||||
### Updating from 1.1 to 1.2
|
### Updating from 1.1 to 1.2
|
||||||
|
|
||||||
No incompatiblities.
|
No incompatibilities.
|
||||||
|
|
||||||
### Updating from 1.0 to 1.1
|
### Updating from 1.0 to 1.1
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ explorers and manifest to custom directories.
|
||||||
|
|
||||||
This document will guide you to a successful update.
|
This document will guide you to a successful update.
|
||||||
|
|
||||||
## Preperation
|
## Preparation
|
||||||
|
|
||||||
As for every software and system you use in production, you should first of
|
As for every software and system you use in production, you should first of
|
||||||
all make a backup of your data. To prevent any breakage, it is
|
all make a backup of your data. To prevent any breakage, it is
|
||||||
|
@ -35,7 +35,7 @@ Now try to merge upstream into the new branch.
|
||||||
% git merge origin/2.1
|
% git merge origin/2.1
|
||||||
|
|
||||||
Fix any conflicts that may have been occurred due to local changes
|
Fix any conflicts that may have been occurred due to local changes
|
||||||
and then **git add** and *git commit** those changes. This should seldomly
|
and then **git add** and *git commit** those changes. This should seldom
|
||||||
occur and if, it's mostly for people hacking on the cdist core.
|
occur and if, it's mostly for people hacking on the cdist core.
|
||||||
|
|
||||||
## Move "conf" directory
|
## Move "conf" directory
|
||||||
|
|
Loading…
Reference in a new issue