Merge branch 'master' into filedirectorylink
This commit is contained in:
commit
0847b5b364
6 changed files with 59 additions and 39 deletions
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
__cdist_version="1.0.3"
|
__cdist_version="1.0.4"
|
||||||
|
|
||||||
# Fail if something bogus is going on
|
# Fail if something bogus is going on
|
||||||
set -u
|
set -u
|
||||||
|
|
|
@ -67,4 +67,4 @@ cdist-dir push "$__cdist_target_host" "$__cdist_out_object_dir" \
|
||||||
# And finally - execute the code
|
# And finally - execute the code
|
||||||
cdist-code-run-all "$__cdist_target_host"
|
cdist-code-run-all "$__cdist_target_host"
|
||||||
|
|
||||||
echo "cdist $__cdist_version: success on $__cdist_target_host"
|
echo "cdist $__cdist_version: Successfully finished run on $__cdist_target_host"
|
||||||
|
|
|
@ -18,14 +18,14 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Setup environment for use with cdist
|
# Setup environment for use with cdist - must be standalone!
|
||||||
#
|
#
|
||||||
|
|
||||||
. cdist-config
|
__cdist_pwd="$(pwd -P)"
|
||||||
[ $# -eq 0 ] || __cdist_usage "no arguments"
|
__cdist_mydir="${0%/*}";
|
||||||
|
__cdist_abs_mydir="$(cd "$__cdist_mydir" && pwd -P)"
|
||||||
# Allow access to unset variables like PATH and MANPATH
|
__cdist_myname=${0##*/};
|
||||||
set +u
|
__cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
|
||||||
|
|
||||||
echo export PATH=$__cdist_abs_mydir:$PATH
|
echo export PATH=$__cdist_abs_mydir:$PATH
|
||||||
|
|
||||||
|
|
50
conf/type/__addifnosuchline/man.text
Normal file
50
conf/type/__addifnosuchline/man.text
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
cdist-type__addifnosuchline(7)
|
||||||
|
==============================
|
||||||
|
Daniel Roth <dani-cdist--@--d-roth.li>
|
||||||
|
|
||||||
|
|
||||||
|
NAME
|
||||||
|
----
|
||||||
|
cdist-type__addifnosuchline - Add a line (if not existing already)
|
||||||
|
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
-----------
|
||||||
|
This type can be used to check a file for existence of a
|
||||||
|
specific line and adding it, if it was not found.
|
||||||
|
|
||||||
|
|
||||||
|
REQUIRED PARAMETERS
|
||||||
|
-------------------
|
||||||
|
line::
|
||||||
|
Specifies the content which shall be added if not existing.
|
||||||
|
|
||||||
|
|
||||||
|
OPTIONAL PARAMETERS
|
||||||
|
-------------------
|
||||||
|
file::
|
||||||
|
If supplied, use this as the destination file.
|
||||||
|
Otherwise the object_id is used.
|
||||||
|
|
||||||
|
|
||||||
|
EXAMPLES
|
||||||
|
--------
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
# Creates or appends the line specifiend in "include_www" to the file "lighttpd.conf"
|
||||||
|
__addifnosuchline www --file /etc/lighttpd.conf --line include_www
|
||||||
|
|
||||||
|
# Adds the line "include_git" to the file "lighttpd.conf"
|
||||||
|
__addifnosuchline /etc/lighttpd.conf --line include_git
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
SEE ALSO
|
||||||
|
--------
|
||||||
|
- cdist-type(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,4 +1,4 @@
|
||||||
1.0.4:
|
1.0.4: 2011-03-15
|
||||||
* New type __motd
|
* New type __motd
|
||||||
* New type __addifnosuchline
|
* New type __addifnosuchline
|
||||||
* Document type __issue
|
* Document type __issue
|
||||||
|
|
|
@ -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).
|
|
Loading…
Reference in a new issue