Merge remote-tracking branch 'sans/master'

conf/type/__autofs_map/man.text

@@ -0,0 +1,60 @@
+cdist-type__autofs_map(7)
+=========================
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+NAME
+----
+cdist-type__autofs_map - Manage autofs maps
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to define maps for autofs.
+
+
+OBJECT ID
+---------
+The object_id is used as the mount-point as described in auto.master(5).
+
+
+REQUIRED PARAMETERS
+-------------------
+map::
+   Name of the map to use. See auto.master(5).
+
+
+OPTIONAL PARAMETERS
+-------------------
+type::
+   Type of map used for this mount point. Defaults to 'file'.
+   See map-type in auto.master(5) for possible values.
+options::
+   See auto.master(5).
+comment::
+   A comment describing this map. Is added to the generated entry in
+   auto.master.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Add auto mounter at /net
+__autofs_map /net --map /etc/auto.net --type program
+
+# Add auto mounter at /pub
+__autofs_map /pub --map /etc/auto.pub \
+   --type file --options nosuid,rw,bg,hard,intr --ghost
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).

conf/type/__autofs_map/manifest

@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+#
+# 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/>.
+#
+
+name="/$__object_id"
+map="$(cat "$__object/parameter/map")"
+
+if [ -f "$__object/parameter/type" ]; then
+   type="$(cat "$__object/parameter/type")"
+else
+   type="file"
+   echo "$type" > "$__object/parameter/type"
+fi
+
+# Generate entry for use in auto.master
+entry="${name} ${type}:${map}"
+if [ -f "$__object/parameter/options" ]; then
+   entry="$entry $(cat "$__object/parameter/options")"
+fi
+if [ -f "$__object/parameter/comment" ]; then
+   echo "# $(cat "$__object/parameter/comment")" > "$__object/parameter/entry"
+fi
+echo "$entry" >> "$__object/parameter/entry"
+
+require="$__self" __autofs_master
+

conf/type/__autofs_map/parameter/optional

@@ -0,0 +1,3 @@
+type
+options
+comment

conf/type/__autofs_map/parameter/required

@@ -0,0 +1 @@
+map

conf/type/__autofs_master/files/auto.master.header

@@ -0,0 +1,3 @@
+# Generated from cdist __autofs_master
+# Do not change this file. Changes will be overwritten.
+

conf/type/__autofs_master/gencode-local

@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+#
+# 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/>.
+#
+#
+# Generate auto.master config based on all defined __autofs_map ojbects.
+#
+
+auto_master="$__object/files/auto.master"
+cat "$(cat "$__object/parameter/header")" > "$auto_master"
+find "$__global/object/__autofs_map" -path "*.cdist/parameter/entry" | xargs cat >> "$auto_master"

conf/type/__autofs_master/man.text

@@ -0,0 +1,47 @@
+cdist-type__autofs_master(7)
+========================
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+NAME
+----
+cdist-type__autofs_master - Generate the auto.master file
+
+
+DESCRIPTION
+-----------
+This cdist type generates a auto.master configuration from given __autofs_map
+definitions. See cdist-type__auto_map(7).
+
+
+REQUIRED PARAMETERS
+-------------------
+None
+
+OPTIONAL PARAMETERS
+-------------------
+header::
+   Absolute path to a file used as the header for the generated auto.master
+   file.
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# auto.master with default header
+__autofs_master
+
+# auto.master with custom header
+__autofs_master --header /path/to/header
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).

conf/type/__autofs_master/manifest

@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+#
+# 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/>.
+#
+
+
+if [ ! -f "$__object/parameter/header" ]; then
+   echo "$__type/files/auto.master.header" > "$__object/parameter/header"
+fi
+
+[ -d "$__object/files" ] || mkdir "$__object/files"
+require="$__self" __file /etc/auto.master --source "$__object/files/auto.master" \
+   --mode 644 \
+   --owner root \
+   --group root
+

conf/type/__autofs_master/parameter/optional

@@ -0,0 +1 @@
+header