ObPuppetHeaders

[mirror/dsa-puppet.git] / modules / geodns / files / common / recvconf

diff --git a/modules/geodns/files/common/recvconf b/modules/geodns/files/common/recvconf
index df312e8..05419c9 100755 (executable)
--- a/modules/geodns/files/common/recvconf
+++ b/modules/geodns/files/common/recvconf
@@ -1,10 +1,15 @@
 #!/bin/bash
 
+#
+# THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+# USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+#
+
 set -e
 set -u
 
 ## Copyright (c) 2005 David B. Harris <dbharris@eelf.ddts.net>
-## Copyright (c) 2005 Peter Palfrader <peter@palfrader.org>
+## Copyright (c) 2005,2009 Peter Palfrader <peter@palfrader.org>
 
 ## This text is released under the "three-clause BSD license".
 ## The full text of the license is available at the end of this file.
@@ -18,6 +23,8 @@ FILELIST="$1"
 
 printf "\nrecvconf on %s processing:\n" "$(hostname -s)"
 
+umask 077
+
 temptar="$(mktemp)"
 chmod 0600 "$temptar"
 
@@ -92,7 +99,14 @@ copy_and_runcommands() {
 
 IN=0
 linenum=0
+file=""
 nextfile=""
+
+clear_vars() {
+       perms=""; user=""; group=""; precommand=""; postcommand=""
+}
+clear_vars
+
 while read line; do
     linenum="$(($linenum + 1))"
 
@@ -118,7 +132,7 @@ while read line; do
        ## the file, then set a $file to the new value and continue parsing.
        [ -n "$file" ] && copy_and_runcommands "$file" "$perms" "$user" "$group" "$precommand" "$postcommand"
        file="$(printf "%s" "$line" | sed -e 's/[[:space:]]*file[[:space:]]\+\([^[:space:]#]*\).*/\1/')"
-       perms=""; user=""; group=""; precommand=""; postcommand=""
+       clear_vars
        continue
     fi