From 03cc2a63b163fabd2654843acbabba5d00301d1b Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Wed, 7 Nov 2012 14:28:30 +0100
Subject: [PATCH] types to handle autofs maps

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__autofs/man.text             | 42 +++++++++
 .../gencode-local => __autofs/manifest}       | 26 ++++--
 .../{__autofs_master => __autofs}/singleton   |  0
 cdist/conf/type/__autofs_map/explorer/entry   | 50 ++++++++++
 cdist/conf/type/__autofs_map/gencode-remote   | 93 +++++++++++++++++++
 cdist/conf/type/__autofs_map/man.text         | 20 +++-
 cdist/conf/type/__autofs_map/manifest         | 45 +++++----
 .../conf/type/__autofs_map/parameter/boolean  |  1 +
 .../__autofs_master/files/auto.master.header  |  3 -
 .../type/__autofs_master/parameter/optional   |  1 -
 .../gencode-remote}                           | 24 +++--
 .../man.text                                  | 23 ++---
 cdist/conf/type/__autofs_reload/singleton     |  0
 13 files changed, 273 insertions(+), 55 deletions(-)
 create mode 100644 cdist/conf/type/__autofs/man.text
 rename cdist/conf/type/{__autofs_master/gencode-local => __autofs/manifest} (59%)
 rename cdist/conf/type/{__autofs_master => __autofs}/singleton (100%)
 create mode 100755 cdist/conf/type/__autofs_map/explorer/entry
 create mode 100755 cdist/conf/type/__autofs_map/gencode-remote
 create mode 100644 cdist/conf/type/__autofs_map/parameter/boolean
 delete mode 100644 cdist/conf/type/__autofs_master/files/auto.master.header
 delete mode 100644 cdist/conf/type/__autofs_master/parameter/optional
 rename cdist/conf/type/{__autofs_master/manifest => __autofs_reload/gencode-remote} (62%)
 rename cdist/conf/type/{__autofs_master => __autofs_reload}/man.text (51%)
 create mode 100644 cdist/conf/type/__autofs_reload/singleton

diff --git a/cdist/conf/type/__autofs/man.text b/cdist/conf/type/__autofs/man.text
new file mode 100644
index 00000000..9b343309
--- /dev/null
+++ b/cdist/conf/type/__autofs/man.text
@@ -0,0 +1,42 @@
+cdist-type__autofs(7)
+=====================
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+NAME
+----
+cdist-type__autofs - install and start autofs
+
+
+DESCRIPTION
+-----------
+This space intentionally left blank.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+None.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__autofs
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__autofs_master/gencode-local b/cdist/conf/type/__autofs/manifest
similarity index 59%
rename from cdist/conf/type/__autofs_master/gencode-local
rename to cdist/conf/type/__autofs/manifest
index 701f97a8..31844415 100755
--- a/cdist/conf/type/__autofs_master/gencode-local
+++ b/cdist/conf/type/__autofs/manifest
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -17,10 +17,22 @@
 # 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"
+
+os=$(cat "$__global/explorer/os")
+
+not_supported() {
+   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
+}
+
+case "$os" in
+   ubuntu|debian|archlinux)
+      __package autofs --state present
+      __start_on_boot autofs --state present
+   ;;
+   *)
+      not_supported
+   ;;
+esac
diff --git a/cdist/conf/type/__autofs_master/singleton b/cdist/conf/type/__autofs/singleton
similarity index 100%
rename from cdist/conf/type/__autofs_master/singleton
rename to cdist/conf/type/__autofs/singleton
diff --git a/cdist/conf/type/__autofs_map/explorer/entry b/cdist/conf/type/__autofs_map/explorer/entry
new file mode 100755
index 00000000..7aa26518
--- /dev/null
+++ b/cdist/conf/type/__autofs_map/explorer/entry
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# 2011 - 2012 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/>.
+#
+
+candidates="/etc/auto.master /etc/autofs/auto.master"
+find_auto_master() {
+   # get the path of the auto.master file
+   for candidate in $candidates; do
+      if [ -f "$candidate" ]; then
+         echo "$candidate"
+         return
+      fi
+   done
+}
+
+auto_master="$(find_auto_master)"
+
+# no auto.master, nothing we could do
+[ -f "$auto_master" ] || exit 0
+
+# NOTE: keep variables in sync in manifest/explorer/gencode-*
+prefix="#cdist:$__object_name"
+suffix="#/cdist:$__object_name"
+awk -v prefix="$prefix" -v suffix="$suffix" '{
+   if (index($0,prefix)) {
+      triggered=1
+   }
+   if (triggered) {
+      if (index($0,suffix)) {
+            triggered=0
+      }
+      print
+   }
+}' "$auto_master"
diff --git a/cdist/conf/type/__autofs_map/gencode-remote b/cdist/conf/type/__autofs_map/gencode-remote
new file mode 100755
index 00000000..fa6acffb
--- /dev/null
+++ b/cdist/conf/type/__autofs_map/gencode-remote
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# 2011 - 2012 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/>.
+#
+
+entry="$__object/files/entry"
+state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo present)"
+if [ ! -s "$__object/explorer/entry" ]; then
+   state_is='absent'
+else
+   state_is=$(diff -q "$entry" "$__object/explorer/entry" >/dev/null \
+      && echo present \
+      || echo changed
+   )
+fi
+
+if [ "$state_should" = "$state_is" ]; then
+   # Nothing to do, move along
+   exit 0
+fi
+
+cat << DONE
+candidates="/etc/auto.master /etc/autofs/auto.master"
+find_auto_master() {
+   # get the path of the auto.master file
+   for candidate in \$candidates; do
+      if [ -f "\$candidate" ]; then
+         echo "\$candidate"
+         return
+      fi
+   done
+}
+
+auto_master="\$(find_auto_master)"
+
+if [ ! -f "\$auto_master" ]; then
+   echo "Could not determine auto.master location, tried: \$candidates" >&2
+   exit 1
+fi
+DONE
+
+remove_entry() {
+   # NOTE: keep variables in sync in manifest/explorer/gencode-*
+   prefix="#cdist:$__object_name"
+   suffix="#/cdist:$__object_name"
+   cat << DONE
+awk -v prefix="$prefix" -v suffix="$suffix" '
+{
+   if (index(\$0,prefix)) {
+      triggered=1
+   }
+   if (triggered) {
+      if (index(\$0,suffix)) {
+         triggered=0
+      }
+   } else {
+      print
+   }
+}' "\$auto_master" > "\$auto_master"+
+mv -f "\$auto_master"+ "\$auto_master"
+DONE
+}
+
+case "$state_should" in
+   present)
+      if [ "$state_is" = "changed" ]; then
+         remove_entry
+      fi
+      cat << DONE
+cat >> "\$auto_master" << EOC
+$(cat "$entry")
+EOC
+DONE
+   ;;
+   absent)
+      remove_entry
+   ;;
+esac
diff --git a/cdist/conf/type/__autofs_map/man.text b/cdist/conf/type/__autofs_map/man.text
index 941e22da..50ce2fa8 100644
--- a/cdist/conf/type/__autofs_map/man.text
+++ b/cdist/conf/type/__autofs_map/man.text
@@ -36,25 +36,35 @@ comment::
    auto.master.
 
 
+BOOLEAN PARAMETERS
+------------------
+noreload::
+   don't reload autofs after the entry has been changed
+
+
 EXAMPLES
 --------
 
 --------------------------------------------------------------------------------
-# Add auto mounter at /net
+# Add auto mounter at /net and reload
 __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
+# Add auto mounter at /pub and don't reload
+__autofs_map /pub \
+   --map /etc/auto.pub \
+   --type file \
+   --options "nosuid,rw,bg,hard,intr --ghost" \
+   --noreload
 --------------------------------------------------------------------------------
 
 
 SEE ALSO
 --------
 - cdist-type(7)
+- cdist-type__autofs_reload(7)
 
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012 Steven Armstrong. Free use of this software is
 granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__autofs_map/manifest b/cdist/conf/type/__autofs_map/manifest
index d86ea799..58dc0f98 100755
--- a/cdist/conf/type/__autofs_map/manifest
+++ b/cdist/conf/type/__autofs_map/manifest
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011 - 2012 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -20,23 +20,36 @@
 
 name="/$__object_id"
 map="$(cat "$__object/parameter/map")"
+type="$(cat "$__object/parameter/type" 2>/dev/null || echo "file")"
+options="$(cat "$__object/parameter/options" 2>/dev/null || true)"
 
-if [ -f "$__object/parameter/type" ]; then
-   type="$(cat "$__object/parameter/type")"
-else
-   type="file"
-   echo "$type" > "$__object/parameter/type"
-fi
+# NOTE: keep variables in sync in manifest/explorer/gencode-*
+prefix="#cdist:$__object_name"
+suffix="#/cdist:$__object_name"
 
-# Generate entry for use in auto.master
-entry="${name} ${type}:${map}"
-if [ -f "$__object/parameter/options" ]; then
-   entry="$entry $(cat "$__object/parameter/options")"
-fi
+mkdir "$__object/files"
+
+# Generate entry for inclusion in auto.master
+entry="$__object/files/entry"
+echo "$prefix" > "$entry"
 if [ -f "$__object/parameter/comment" ]; then
-   echo "# $(cat "$__object/parameter/comment")" > "$__object/parameter/entry"
+   echo "# $(cat "$__object/parameter/comment")" >> "$entry"
 fi
-echo "$entry" >> "$__object/parameter/entry"
-
-require="$__object_name" __autofs_master
+echo "$name $type:$map $options" >> $entry
+echo "$suffix" >> "$entry"
 
+# Reload autofs after changes if the user wishes this
+if [ ! -f "$__object/parameter/noreload" ]; then
+   state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo present)"
+   if [ ! -s "$__object/explorer/entry" ]; then
+      state_is='absent'
+   else
+      state_is=$(diff -q "$entry" "$__object/explorer/entry" >/dev/null \
+         && echo present \
+         || echo changed
+      )
+   fi
+   if [ "$state_is" != "$state_should" ]; then
+      require="$__object_name" __autofs_reload
+   fi
+fi
diff --git a/cdist/conf/type/__autofs_map/parameter/boolean b/cdist/conf/type/__autofs_map/parameter/boolean
new file mode 100644
index 00000000..862edc87
--- /dev/null
+++ b/cdist/conf/type/__autofs_map/parameter/boolean
@@ -0,0 +1 @@
+noreload
diff --git a/cdist/conf/type/__autofs_master/files/auto.master.header b/cdist/conf/type/__autofs_master/files/auto.master.header
deleted file mode 100644
index 53590257..00000000
--- a/cdist/conf/type/__autofs_master/files/auto.master.header
+++ /dev/null
@@ -1,3 +0,0 @@
-# Generated from cdist __autofs_master
-# Do not change this file. Changes will be overwritten.
-
diff --git a/cdist/conf/type/__autofs_master/parameter/optional b/cdist/conf/type/__autofs_master/parameter/optional
deleted file mode 100644
index 8e83f898..00000000
--- a/cdist/conf/type/__autofs_master/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-header
diff --git a/cdist/conf/type/__autofs_master/manifest b/cdist/conf/type/__autofs_reload/gencode-remote
similarity index 62%
rename from cdist/conf/type/__autofs_master/manifest
rename to cdist/conf/type/__autofs_reload/gencode-remote
index e429842e..883602e2 100755
--- a/cdist/conf/type/__autofs_master/manifest
+++ b/cdist/conf/type/__autofs_reload/gencode-remote
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -19,13 +19,19 @@
 #
 
 
-if [ ! -f "$__object/parameter/header" ]; then
-   echo "$__type/files/auto.master.header" > "$__object/parameter/header"
-fi
+os=$(cat "$__global/explorer/os")
 
-[ -d "$__object/files" ] || mkdir "$__object/files"
-require="$__object_name" __file /etc/auto.master --source "$__object/files/auto.master" \
-   --mode 644 \
-   --owner root \
-   --group root
+not_supported() {
+   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
+}
 
+case "$os" in
+   ubuntu|debian|archlinux)
+      echo "pkill -HUP automount"
+   ;;
+   *)
+      not_supported
+   ;;
+esac
diff --git a/cdist/conf/type/__autofs_master/man.text b/cdist/conf/type/__autofs_reload/man.text
similarity index 51%
rename from cdist/conf/type/__autofs_master/man.text
rename to cdist/conf/type/__autofs_reload/man.text
index 641c8393..d2085a98 100644
--- a/cdist/conf/type/__autofs_master/man.text
+++ b/cdist/conf/type/__autofs_reload/man.text
@@ -1,38 +1,33 @@
-cdist-type__autofs_master(7)
+cdist-type__autofs_reload(7)
 ============================
 Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 NAME
 ----
-cdist-type__autofs_master - Generate the auto.master file
+cdist-type__autofs_reload - tell automounter to reload config file
 
 
 DESCRIPTION
 -----------
-This cdist type generates a auto.master configuration from given __autofs_map
-definitions. See cdist-type__auto_map(7).
+This space intentionally left blank.
 
 
 REQUIRED PARAMETERS
 -------------------
-None
+None.
+
 
 OPTIONAL PARAMETERS
 -------------------
-header::
-   Absolute path to a file used as the header for the generated auto.master
-   file.
+None.
+
 
 EXAMPLES
 --------
 
 --------------------------------------------------------------------------------
-# auto.master with default header
-__autofs_master
-
-# auto.master with custom header
-__autofs_master --header /path/to/header
+__autofs_reload
 --------------------------------------------------------------------------------
 
 
@@ -43,5 +38,5 @@ SEE ALSO
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012 Steven Armstrong. Free use of this software is
 granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__autofs_reload/singleton b/cdist/conf/type/__autofs_reload/singleton
new file mode 100644
index 00000000..e69de29b