Merge remote-tracking branch 'ungleich/master' into cdist-type__hosts

cdist/__init__.py

@@ -56,6 +56,21 @@ class UnresolvableRequirementsError(cdist.Error):
     pass
 
 
+class CdistBetaRequired(cdist.Error):
+    """Beta functionality is used but beta is not enabled"""
+
+    def __init__(self, command, arg):
+        self.command = command
+        self.arg = arg
+
+    def __str__(self):
+        err_msg = ("\'{}\' argument of \'{}\' command is beta, but beta is "
+                   "not enabled. If you want to use it please enable beta "
+                   "functionalities by using the -b/--enable-beta command "
+                   "line flag.")
+        return err_msg.format(self.arg, self.command)
+
+
 class CdistObjectError(Error):
     """Something went wrong with an object"""
 

cdist/conf/type/__apt_key/man.rst

@@ -55,5 +55,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__apt_key_uri/man.rst

@@ -45,5 +45,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__apt_norecommends/man.rst

@@ -36,5 +36,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2014 Steven Armstrong. Free use of this software is
+Copyright \(C) 2014 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__apt_ppa/man.rst

@@ -44,5 +44,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__apt_source/man.rst

@@ -63,5 +63,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__apt_update_index/man.rst

@@ -35,5 +35,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__block/man.rst

@@ -76,5 +76,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2013 Steven Armstrong. Free use of this software is
+Copyright \(C) 2013 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__ccollect_source/man.rst

@@ -63,5 +63,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2014 Nico Schottelius. Free use of this software is
+Copyright \(C) 2014 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__cdist/man.rst

@@ -57,5 +57,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2013 Nico Schottelius. Free use of this software is
+Copyright \(C) 2013 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__cdistmarker/man.rst

@@ -49,5 +49,7 @@ Daniel Maher <phrawzty+cdist--@--gmail.com>
 
 COPYING
 -------
-Copyright \(C) 2011 Daniel Maher. Free use of this software is granted under
+Copyright \(C) 2011 Daniel Maher. You can redistribute it
-the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__config_file/man.rst

@@ -58,5 +58,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul/man.rst

@@ -48,5 +48,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_agent/man.rst

@@ -175,5 +175,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_check/man.rst

@@ -96,5 +96,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015-2016 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015-2016 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_reload/man.rst

@@ -36,5 +36,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_service/man.rst

@@ -76,5 +76,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_template/man.rst

@@ -135,5 +135,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_template_template/man.rst

@@ -78,5 +78,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015-2016 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015-2016 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_watch_checks/man.rst

@@ -67,5 +67,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_watch_event/man.rst

@@ -60,5 +60,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_watch_key/man.rst

@@ -57,5 +57,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_watch_keyprefix/man.rst

@@ -57,5 +57,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_watch_nodes/man.rst

@@ -53,5 +53,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_watch_service/man.rst

@@ -77,5 +77,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__consul_watch_services/man.rst

@@ -53,5 +53,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__cron/man.rst

@@ -78,5 +78,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011-2013 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011-2013 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__debconf_set_selections/man.rst

@@ -47,5 +47,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011-2014 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2014 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__directory/man.rst

@@ -95,5 +95,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__dog_vdi/man.rst

@@ -53,5 +53,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2014 Nico Schottelius. Free use of this software is
+Copyright \(C) 2014 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__file/man.rst

@@ -106,5 +106,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011-2013 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2013 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__filesystem/explorer/lsblk

@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# 2016 - 2016 Daniel Heule     (hda at sfs.biz)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+
+os=$("$__explorer/os")
+
+if [ -f "$__object/parameter/device" ]; then
+    blkdev="$(cat "$__object/parameter/device")"
+else
+    blkdev="$__object_id"
+fi
+
+case "$os" in
+    centos|fedora|redhat|suse|gentoo)
+        if [ ! -x "$(command -v lsblk)" ]; then
+            echo "lsblk is required for __filesystem type" >&2
+            exit 1
+        else
+            #echo -n $(lsblk -nd -P -o NAME,FSTYPE,LABEL,MOUNTPOINT "$blkdev" 2>/dev/null)
+            lsblk -nd -P -o NAME,FSTYPE,LABEL,MOUNTPOINT "$blkdev" 2>/dev/null
+        fi
+    ;;
+    *)
+        echo "__filesystem type lacks implementation for os: $os" >&2
+        exit 1
+    ;;
+esac

cdist/conf/type/__filesystem/gencode-remote

@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# 2016 - 2016 Daniel Heule     (hda at sfs.biz)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+fstype="$(cat "$__object/parameter/fstype")"
+
+if [ -f "$__object/parameter/device" ]; then
+    mydev="$(cat "$__object/parameter/device")"
+else
+    mydev="$__object_id"
+fi
+
+label="$(cat "$__object/parameter/label")"
+mkfsoptions="$(cat "$__object/parameter/mkfsoptions")"
+
+
+if [ -f "$__object/parameter/force" ]; then
+  # create filesystem even an other filesystem is on disk or the label is not correct, use with caution !
+  forcefs="true"
+else
+  forcefs="false"
+fi
+
+
+
+blkdev_devname="$(grep -P -o 'NAME="\K[^"]*' "$__object/explorer/lsblk")"
+blkdev_fstype="$(grep -P -o 'FSTYPE="\K[^"]*' "$__object/explorer/lsblk")"
+blkdev_label="$(grep -P -o 'LABEL="\K[^"]*' "$__object/explorer/lsblk")"
+blkdev_mountpoint="$(grep -P -o 'MOUNTPOINT="\K[^"]*' "$__object/explorer/lsblk")"
+
+if [ -z "$blkdev_devname" ]; then
+    echo "Specified device $mydev not found on target system" >&2
+    exit 1
+fi
+
+[ "$blkdev_label" = "$label" ] && [ "$blkdev_fstype" = "$fstype" ] && exit 0
+
+if [ -n "$blkdev_mountpoint" ]; then
+    echo "Specified device $mydev is mounted on $blkdev_mountpoint, __filesystem does NOTHING with mountd devices" >&2
+    exit 0
+fi
+
+if [ -n "$blkdev_fstype" ] && [ "$forcefs" != "true" ]; then
+    if [ "$blkdev_label" != "$label" ]; then
+        echo "Specified device $mydev has not the spezified label: $blkdev_label, but __filesystem does NOTHING in this case without the --force option" >&2
+        exit 0
+    fi
+    if [ "$blkdev_fstype" != "$fstype" ]; then
+        echo "Specified device $mydev has not the spezified filesystem: $blkdev_fstype, but __filesystem does NOTHING in this case without the --force option" >&2
+        exit 0
+    fi
+fi
+
+
+# ok, all conditions checked, we need to format the device, lets go
+opts="$mkfsoptions"
+if [ -n "$label" ]; then
+    opts="$opts -L '$label'"
+fi
+
+case "$fstype" in
+    ext2|ext3|ext4)
+        if [ "$forcefs" = "true" ]; then
+            opts="$opts -F"
+        fi
+        echo "mkfs.$fstype $opts /dev/$blkdev_devname"
+    ;;
+    btrfs)
+        if [ "$forcefs" = "true" ]; then
+            opts="$opts --force"
+        fi
+        echo "mkfs.btrfs $opts /dev/$blkdev_devname"
+    ;;
+    xfs)
+        if [ "$forcefs" = "true" ]; then
+            opts="$opts -f"
+        fi
+        echo "mkfs.xfs $opts /dev/$blkdev_devname"
+    ;;
+    *)
+        echo "__filesystem type lacks implementation for filesystem: $fstype" >&2
+        exit 1
+    ;;
+esac
+echo "filesystem $fstype on $mydev : /dev/$blkdev_devname created" >> "$__messages_out"

cdist/conf/type/__filesystem/man.rst

@@ -0,0 +1,81 @@
+cdist-type__filesystem(7)
+=========================
+
+NAME
+----
+cdist-type__filesystem - Create Filesystems.
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to create filesystems on devices.
+
+If the device is mounted on target, it refuses to do anything.
+
+If the device has a filesystem other then the specified and/or
+the label is not correct, it only makes a new filesystem 
+if you have specified --force option.
+
+
+REQUIRED PARAMETERS
+-------------------
+fstype
+    Filesystem type, for example 'ext3', 'btrfs' or 'xfs'.
+
+
+
+OPTIONAL PARAMETERS
+-------------------
+device
+    Blockdevice for filesystem, Defaults to object_id.
+    On linux, it can be any lsblk accepted device notation.
+
+    | 
+    | For example:
+    |    /dev/sdx 
+    |    or /dev/disk/by-xxxx/xxx
+    |    or /dev/mapper/xxxx
+
+label
+   Label which sould apply on the filesystem.
+
+mkfsoptions
+   Additional options which are inserted to the mkfs.xxx call.
+
+
+BOOLEAN PARAMETERS
+------------------
+force
+   Normaly, this type does nothing if a filesystem is found
+   on the target device. If you specify force, it's formated
+   if the filesystem type or label differs from parameters.
+   Warning: This option can easily lead into data loss!
+
+MESSAGES
+--------
+filesystem <fstype> on <device> \: <discoverd device> created
+   Filesytem was created on <discoverd device>
+
+
+EXAMPLES
+--------
+
+.. code-block:: sh
+
+    # Ensures that device /dev/sdb is formated with xfs 
+    __filesystem /dev/sdb --fstype xfs --label Testdisk1
+    # The same thing with btrfs and disk spezified by pci path to disk 1:0 on vmware
+    __filesystem dev_sdb --fstype btrfs --device /dev/disk/by-path/pci-0000:0b:00.0-scsi-0:0:0:0 --label Testdisk2
+    # Make sure that a multipath san device has a filesystem ...
+    __filesystem dev_sdb --fstype xfs --device /dev/mapper/360060e80432f560050202f22000023ff --label Testdisk3
+
+
+AUTHORS
+-------
+Daniel Heule <hda--@--sfs.biz>
+
+
+COPYING
+-------
+Copyright \(C) 2016 Daniel Heule. Free use of this software is
+granted under the terms of the GNU General Public License version 3 or any later version (GPLv3+).

cdist/conf/type/__filesystem/parameter/boolean

@@ -0,0 +1 @@
+force

cdist/conf/type/__filesystem/parameter/optional

@@ -0,0 +1,3 @@
+device
+label
+mkfsoptions

cdist/conf/type/__filesystem/parameter/required

@@ -0,0 +1 @@
+fstype

cdist/conf/type/__firewalld_rule/man.rst

@@ -75,5 +75,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2015 Nico Schottelius. Free use of this software is
+Copyright \(C) 2015 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__git/man.rst

@@ -54,5 +54,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2012 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__group/man.rst

@@ -74,5 +74,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011-2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011-2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__hostname/man.rst

@@ -46,5 +46,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__iptables_apply/man.rst

@@ -39,5 +39,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2013 Nico Schottelius. Free use of this software is
+Copyright \(C) 2013 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__iptables_rule/man.rst

@@ -60,5 +60,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2013 Nico Schottelius. Free use of this software is
+Copyright \(C) 2013 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__issue/man.rst

@@ -41,5 +41,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__jail/man.rst

@@ -118,5 +118,7 @@ Jake Guffey <jake.guffey--@--jointheirstm.org>
 
 COPYING
 -------
-Copyright \(C) 2012,2016 Jake Guffey. Free use of this software is
+Copyright \(C) 2012,2016 Jake Guffey. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__jail_freebsd10/man.rst

@@ -117,5 +117,7 @@ Jake Guffey <jake.guffey--@--jointheirstm.org>
 
 COPYING
 -------
-Copyright \(C) 2012-2016 Jake Guffey. Free use of this software is
+Copyright \(C) 2012-2016 Jake Guffey. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__jail_freebsd9/man.rst

@@ -118,5 +118,7 @@ Jake Guffey <jake.guffey--@--eprotex.com>
 
 COPYING
 -------
-Copyright \(C) 2012-2016 Jake Guffey. Free use of this software is
+Copyright \(C) 2012-2016 Jake Guffey. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__key_value/man.rst

@@ -88,5 +88,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__keyboard/man.rst

@@ -0,0 +1,37 @@
+cdist-type__keyboard(7)
+=======================
+
+NAME
+----
+cdit-type__keyboard - Set keyboard layout
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to modify keyboard layout.
+
+
+REQUIRED PARAMETERS
+-------------------
+type
+   Any valid type, for example "us"
+
+
+EXAMPLES
+--------
+
+.. code-block:: sh
+
+    # Set keyboard type to "us"
+    __keyboard --type "us"
+
+
+AUTHORS
+-------
+Carlos Ortigoza <carlos.ortigoza--@--ungleich.ch>
+
+
+COPYING
+-------
+Copyright \(C) 2016 Carlos Ortigoza. Free use of this software is
+granted under the terms of the GNU General Public License v3 or later (GPLv3+).

cdist/conf/type/__keyboard/manifest

@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# Carlos Ortigoza (carlos.ortigoza at ungleich.ch)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Configure keyboard type by modifying /etc/sysconfig/keyboard file.
+#
+
+os=$(cat "$__global/explorer/os")
+keyboard_type="$(cat "$__object/parameter/type")"
+
+case "$os" in
+    centos)
+        __file /etc/sysconfig/keyboard \
+            --owner root --group root --mode 644 \
+            --state exists
+
+        require="__file/etc/sysconfig/keyboard" \
+            __key_value KEYTABLE \
+                --file /etc/sysconfig/keyboard \
+                --delimiter '=' \
+                --value "\"$keyboard_type\""
+        
+        require="__file/etc/sysconfig/keyboard" \
+            __key_value LAYOUT \
+                --file /etc/sysconfig/keyboard \
+                --delimiter '=' \
+                --value "\"$keyboard_type\""
+    ;;
+    *)
+      echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
+      echo "Please contribute an implementation for it if you can." >&2
+      exit 1
+    ;;
+esac

cdist/conf/type/__keyboard/parameter/required

@@ -0,0 +1 @@
+type

cdist/conf/type/__line/man.rst

@@ -71,5 +71,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2012-2013 Nico Schottelius. Free use of this software is
+Copyright \(C) 2012-2013 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__link/man.rst

@@ -54,5 +54,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2012 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__locale/man.rst

@@ -3,7 +3,7 @@ cdist-type__locale(7)
 
 NAME
 ----
-cdit-type__locale - Configure locales
+cdist-type__locale - Configure locales
 
 
 DESCRIPTION
@@ -34,7 +34,7 @@ EXAMPLES
 
 SEE ALSO
 --------
-:strong:`locale`\ (1), :strong:`localedef`\ (1)
+:strong:`locale`\ (1), :strong:`localedef`\ (1), :strong:`cdist-type__locale_system`\ (7)
 
 
 AUTHORS
@@ -44,5 +44,6 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2013-2014 Nico Schottelius. Free use of this software is
+Copyright \(C) 2013-2016 Nico Schottelius. Free use of this software is
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+granted under the terms of the GNU General Public License version 3 or
+later (GPLv3+).

cdist/conf/type/__locale_system/man.rst

@@ -0,0 +1,64 @@
+cdist-type__locale_system(7)
+============================
+
+NAME
+----
+cdist-type__locale_system - Set system-wide locale
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to modify system-wide locale.
+The name of the locale category is given as the object id
+(usually you are probably interested in using LANG).
+
+
+OPTIONAL PARAMETERS
+-------------------
+
+state
+    present or absent, defaults to present.
+    If present, sets the locale category to the given value.
+    If absent, removes the locale category from the system file.
+
+value
+    The value for the locale category.
+    Defaults to en_US.UTF-8.
+
+
+EXAMPLES
+--------
+
+.. code-block:: sh
+
+    # Set LANG to en_US.UTF-8
+    __locale_system LANG
+
+    # Same as above, but more explicit
+    __locale_system LANG --value en_US.UTF-8
+
+    # Set category LC_MESSAGES to de_CH.UTF-8
+    __locale_system LC_MESSAGES --value de_CH.UTF-8
+
+    # Remove setting for LC_ALL
+    __locale_system LC_ALL --state absent
+
+
+
+SEE ALSO
+--------
+:strong:`locale`\ (1), :strong:`localedef`\ (1), :strong:`cdist-type__locale`\ (7)
+
+
+AUTHORS
+-------
+| Steven Armstrong <steven-cdist--@--armstrong.cc>
+| Carlos Ortigoza <carlos.ortigoza--@--ungleich.ch>
+| Nico Schottelius <nico.schottelius--@--ungleich.ch>
+
+
+COPYING
+-------
+Copyright \(C) 2016 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 or
+later (GPLv3+).

cdist/conf/type/__locale_system/manifest

@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# 2012-2016 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2016 Carlos Ortigoza (carlos.ortigoza at ungleich.ch)
+# 2016 Nico Schottelius (nico.schottelius at ungleich.ch)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Configure system-wide locale by modifying i18n file.
+#
+
+os=$(cat "$__global/explorer/os")
+
+case "$os" in
+    debian|ubuntu)
+        locale_conf="/etc/default/locale"
+        ;;
+    archlinux)
+        locale_conf="/etc/locale.conf"
+        ;;
+    redhat|centos)
+        locale_conf="/etc/sysconfig/i18n"
+        ;;
+    *)
+        echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
+        echo "Please contribute an implementation for it if you can." >&2
+        exit 1
+        ;;
+esac
+
+__file "$locale_conf" \
+       --owner root --group root --mode 644 \
+       --state exists
+
+require="__file/$locale_conf" \
+       __key_value "$locale_conf:$__object_id" \
+       --file "$locale_conf" \
+       --key "$__object_id" \
+       --delimiter = \
+       --state "$(cat "$__object/parameter/state")" \
+       --value "$(cat "$__object/parameter/value")"

cdist/conf/type/__locale_system/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__locale_system/parameter/default/value

@@ -0,0 +1 @@
+en_US.UTF-8

cdist/conf/type/__locale_system/parameter/optional

@@ -0,0 +1,2 @@
+state
+value

cdist/conf/type/__motd/man.rst

@@ -42,5 +42,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__mount/man.rst

@@ -78,5 +78,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2014 Steven Armstrong. Free use of this software is
+Copyright \(C) 2014 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__mysql_database/man.rst

@@ -43,5 +43,7 @@ Benedikt Koeppel <code@benediktkoeppel.ch>
 
 COPYING
 -------
-Copyright \(C) 2012 Benedikt Koeppel. Free use of this software is
+Copyright \(C) 2012 Benedikt Koeppel. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package/man.rst

@@ -58,5 +58,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_apt/man.rst

@@ -56,5 +56,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2012 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_emerge/man.rst

@@ -57,5 +57,7 @@ Thomas Oettli <otho--@--sfs.biz>
 
 COPYING
 -------
-Copyright \(C) 2013 Thomas Oettli. Free use of this software is
+Copyright \(C) 2013 Thomas Oettli. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_emerge_dependencies/man.rst

@@ -46,5 +46,7 @@ Thomas Oettli <otho--@--sfs.biz>
 
 COPYING
 -------
-Copyright \(C) 2013 Thomas Oettli. Free use of this software is
+Copyright \(C) 2013 Thomas Oettli. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_luarocks/man.rst

@@ -49,5 +49,7 @@ Christian G. Warden <cwarden@xerus.org>
 
 COPYING
 -------
-Copyright \(C) 2012 SwellPath, Inc. Free use of this software is
+Copyright \(C) 2012 SwellPath, Inc. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_opkg/man.rst

@@ -49,5 +49,7 @@ Giel van Schijndel <giel+cdist--@--mortis.eu>
 
 COPYING
 -------
-Copyright \(C) 2012 Giel van Schijndel. Free use of this software is
+Copyright \(C) 2012 Giel van Schijndel. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_pacman/man.rst

@@ -52,5 +52,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2012 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_pip/man.rst

@@ -59,5 +59,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2012 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_pkg_freebsd/man.rst

@@ -64,5 +64,7 @@ Jake Guffey <jake.guffey--@--eprotex.com>
 
 COPYING
 -------
-Copyright \(C) 2012 Jake Guffey. Free use of this software is
+Copyright \(C) 2012 Jake Guffey. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_pkgng_freebsd/man.rst

@@ -95,5 +95,7 @@ Jake Guffey <jake.guffey--@--eprotex.com>
 
 COPYING
 -------
-Copyright \(C) 2014 Jake Guffey. Free use of this software is
+Copyright \(C) 2014 Jake Guffey. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_rubygem/man.rst

@@ -49,5 +49,8 @@ Chase Allen James <nx-cdist@nu-ex.com>
 
 COPYING
 -------
-Copyright \(C) 2011 Chase Allen James. Free use of this software is
+
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+Copyright \(C) 2011 Chase Allen James. You can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_update_index/man.rst

@@ -22,7 +22,7 @@ OPTIONAL PARAMETERS
 type
     The package manager to use. Default is determined based on the $os
     explorer variable.
-    e.g. 
+    e.g.
     * apt for Debian
     * yum for Red Hat
     * pacman for Arch Linux
@@ -47,5 +47,8 @@ Ricardo Catalinas Jiménez <jimenezrick--@--gmail.com>
 
 COPYING
 -------
-Copyright \(C) 2014 Ricardo Catalinas Jiménez. Free use of this software is
+
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+Copyright \(C) 2014 Ricardo Catalinas Jiménez. You can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_upgrade_all/man.rst

@@ -44,8 +44,10 @@ AUTHORS
 -------
 Ricardo Catalinas Jiménez <jimenezrick--@--gmail.com>
 
-
 COPYING
 -------
-Copyright \(C) 2014 Ricardo Catalinas Jiménez. Free use of this software is
+
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+Copyright \(C) 2014 Ricardo Catalinas Jiménez. You can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_yum/man.rst

@@ -59,5 +59,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2012 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__package_zypper/man.rst

@@ -68,4 +68,6 @@ COPYING
 -------
 Copyright \(C) 2012 Nico Schottelius.
 Copyright \(C) 2013 Daniel Heule.
-Free use of this software is granted under the terms of the GNU General Public License version 3 (GPLv3).
+You can redistribute it and/or modify it under the terms of the
+GNU General Public License as published by the Free Software Foundation,
+either version 3 of the License, or (at your option) any later version.

cdist/conf/type/__pacman_conf/man.rst

@@ -69,5 +69,7 @@ Dominique Roux <dominique.roux4@gmail.com>
 
 COPYING
 -------
-Copyright \(C) 2015 Dominique Roux. Free use of this software is
+Copyright \(C) 2015 Dominique Roux. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__pacman_conf_integrate/man.rst

@@ -45,5 +45,7 @@ Dominique Roux <dominique.roux4@gmail.com>
 
 COPYING
 -------
-Copyright \(C) 2015 Dominique Roux. Free use of this software is
+Copyright \(C) 2015 Dominique Roux. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__pf_apply/man.rst

@@ -49,5 +49,7 @@ Jake Guffey <jake.guffey--@--eprotex.com>
 
 COPYING
 -------
-Copyright \(C) 2012 Jake Guffey. Free use of this software is
+Copyright \(C) 2012 Jake Guffey. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__pf_ruleset/man.rst

@@ -49,5 +49,7 @@ Jake Guffey <jake.guffey--@--eprotex.com>
 
 COPYING
 -------
-Copyright \(C) 2012 Jake Guffey. Free use of this software is
+Copyright \(C) 2012 Jake Guffey. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__postfix/man.rst

@@ -36,5 +36,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__postfix_master/man.rst

@@ -78,6 +78,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
-
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__postfix_postconf/man.rst

@@ -48,5 +48,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__postfix_postmap/man.rst

@@ -36,5 +36,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__postfix_reload/man.rst

@@ -36,5 +36,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__postgres_database/man.rst

@@ -40,5 +40,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__postgres_role/man.rst

@@ -61,5 +61,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__process/man.rst

@@ -68,5 +68,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2012 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__qemu_img/man.rst

@@ -47,5 +47,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2012-2014 Nico Schottelius. Free use of this software is
+Copyright \(C) 2012-2014 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__rbenv/man.rst

@@ -43,5 +43,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2012-2014 Nico Schottelius. Free use of this software is
+Copyright \(C) 2012-2014 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__rsync/man.rst

@@ -108,5 +108,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2015 Nico Schottelius. Free use of this software is
+Copyright \(C) 2015 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__ssh_authorized_key/man.rst

@@ -65,5 +65,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2014 Steven Armstrong. Free use of this software is
+Copyright \(C) 2014 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__ssh_authorized_keys/man.rst

@@ -115,5 +115,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2012-2014 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012-2014 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__ssh_dot_ssh/man.rst

@@ -43,5 +43,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2014 Nico Schottelius. Free use of this software is
+Copyright \(C) 2014 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__staged_file/man.rst

@@ -109,5 +109,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.

cdist/conf/type/__start_on_boot/man.rst

@@ -55,5 +55,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2012 Nico Schottelius. You can redistribute it
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.