Changeset 404 for branches

Timestamp:

07/26/2009 16:07:17 (3 years ago)

Author:

blee

Message:

Merging from trunk confsync and confaudit delay capabilities.

See #55

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confaudit.8 (modified) (2 diffs)
• confaudit.in (modified) (2 diffs)
• confman.conf.5.in (modified) (1 diff)
• confman.conf.in (modified) (1 diff)
• confsync.8 (modified) (2 diffs)
• confsync.in (modified) (2 diffs)

branches/confman-1.9/confaudit.8

@@ -34 +34 @@
 .Nm
 .Op Fl q
+.Op Fl s
 .Nm
 .Fl h
@@ -56 +57 @@
 to display the usage statement and exit.
 .Pp
+The
+.Fl s
+option will cause
+.Nm
+to run in sleep mode.  In this mode,
+.Nm
+will sleep for CONF_AUDIT_SLEEP seconds before executing.  This can be used to
+stagger the execution of
+.Nm
+across multiple managed hosts.
+.Pp
 .Nm
 uses the export file that is generated by 

branches/confman-1.9/confaudit.in

@@ -40 +40 @@
 
 quiet=false
-while getopts "dqh" opt 2>&4 ; do
+sleep_mode=false
+while getopts "dqsh" opt 2>&4 ; do
     case $opt in 
         d) DEBUG=true ;;
         q) quiet=true ;;
+        s) sleep_mode=true ;;
         h) print_help 0 ;;
         *) print_help 1 ;;
@@ -59 +61 @@
 
 conf_lock_system
+
+if $sleep_mode; then
+    if [ -n "${CONF_AUDIT_SLEEP}" ] && [ ${CONF_AUDIT_SLEEP} -ge 0 ]; then
+        echo "Sleeping ${CONF_AUDIT_SLEEP} seconds..."
+        sleep ${CONF_AUDIT_SLEEP}
+    else
+        echo "Invalid sleep value: ${CONF_AUDIT_SLEEP}" >&2
+        exit 1
+    fi
+fi
 
 # Set up our "Working Copy"

branches/confman-1.9/confman.conf.5.in

@@ -104 +104 @@
 client for
 .Cm confsync .
+.It CONF_SYNC_SLEEP
+The number of seconds for
+.Xr confsync 8
+to sleep when running in sleep mode.
+.It CONF_AUDIT_SLEEP
+The number of seconds for
+.Xr confaudit 8
+to sleep when running in sleep mode.
 .It CONF_SSH_KEY
 This option is deprecated and will be removed in a future release. See 

branches/confman-1.9/confman.conf.in

@@ -73 +73 @@
 CONF_SSH_KEY="/root/.ssh/id_rsa"
 
+# confsync sleep (in seconds)
+CONF_SYNC_SLEEP=""
+
+# confaudit sleep (in seconds)
+CONF_AUDIT_SLEEP=""
+
 # Enable or disable debugging
 DEBUG="false"

branches/confman-1.9/confsync.8

@@ -33 +33 @@
 .Sh SYNOPSIS
 .Nm
+.Op Fl s
 .Nm
 .Fl h
@@ -45 +46 @@
 .Cm confman commit
 operation without the overhead of a working copy.
+.Pp
+The
+.Fl s
+option will cause
+.Nm
+to run in sleep mode.  In this mode,
+.Nm
+will sleep for CONF_SYNC_SLEEP seconds before executing.  This can be used to
+stagger the execution of
+.Nm
+across multiple managed hosts.
 .Pp
 When launched with

branches/confman-1.9/confsync.in

@@ -42 +42 @@
 }
 
-while getopts "hd" OPT 2>&4 ; do
+sleep_mode=false
+while getopts "hsd" OPT 2>&4 ; do
     case $OPT in
         d)  DEBUG=true ;;
+        s)  sleep_mode=true ;;
         h)  print_help 0;;
         *)  print_help 1;;
@@ -60 +62 @@
 
 conf_lock_system
+
+if $sleep_mode; then
+    if [ -n "${CONF_SYNC_SLEEP}" ] && [ ${CONF_SYNC_SLEEP} -ge 0 ]; then
+        echo "Sleeping ${CONF_SYNC_SLEEP} seconds..."
+        sleep ${CONF_SYNC_SLEEP}
+    else
+        echo "Invalid sleep value: ${CONF_SYNC_SLEEP}" >&2
+        exit 1
+    fi
+fi
 
 # Set up our "Working Copy"