Changeset 317

Timestamp:

05/02/2009 20:06:17 (3 years ago)

Author:

ccowart

Message:

• Made make aware of the confadmin man page
• Fixed disagreement between repository structure between confman setup and confadmin setup
• Templatized log message

See #8
See #24
See #20

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• confexport.in (modified) (1 diff)
• confman.conf.in (modified) (2 diffs)
• confman.conf.sample.in (modified) (1 diff)
• confman.in (modified) (2 diffs)
• confmancommon.sh.in (modified) (1 diff)
• confmanlib.sh (modified) (2 diffs)

trunk/Makefile.am

@@ -11 +11 @@
 sysconfdefaults_DATA = confman.conf
 bashcomp_DATA = confman_completion
-man_MANS = confman.8 confman.conf.5
-dist_man_MANS = confaudit.8 confexport.8 confman.8 confman.conf.5 confsync.8
+man_MANS = confman.8 confman.conf.5 
+dist_man_MANS = confadmin.8 \
+                                confaudit.8 \
+                                confexport.8 \
+                                confman.8 \
+                                confman.conf.5 \
+                                confsync.8
 
 CLEANFILES = $(sbin_SCRIPTS) \

trunk/confexport.in

@@ -50 +50 @@
 umask 077
 
-REPO_URI="file://$REPO_PATH"
 temp_conf_export=$(conf_tmp_file)
 

trunk/confman.conf.in

@@ -5 +5 @@
 #
 # If you would like to override any portion of this file, please do so
-# in etc/confman.conf or ~/.confmanrc.
+# in @sysconfdir@/confman.conf or ~/.confmanrc.
 
 # $Id$
+
+# The system-wide configuration file
+GCONF="@sysconfdir@/confman.conf"
 
 # The location of our shell library
@@ -38 +41 @@
 # The path to our current host's recipe file
 RECIPE_FILE="${REPO_DB}/recipe"
+
+# The template for log messages
+LOG_TEMPLATE="/dev/null"
 
 # The warning message for all files

trunk/confman.conf.sample.in

@@ -12 +12 @@
 REPO_PATH="@prefix@/repo/conf/conf"
 
+# This file will be concatenated with the confman status output and opened
+# in a user's editor before commits.
+#LOG_TEMPLATE="/dev/null"
+
 # The list of singularities on this host
 SINGULARITIES="/etc/rc.conf"

trunk/confman.in

@@ -120 +120 @@
         # Moved up per Ian's request.
         $SUDO ${SUDO:+-v}
-        echo "Change this file to your log message." > $msg
-        echo "BugId: " >> $msg
-        echo "$ignoreline" >> $msg
+        cat $LOG_TEMPLATE > $msg
+        printf "\n${ignoreline}\n" >> $msg
         conf_get_recipe | tr ' ' '\n' | xargs -I % svn status \
             ${WORK_PATH}/% >> $status
@@ -172 +171 @@
         local files
         # Moved up per Ian's request.
-        echo "Change this file to your log message." > $msg
-        echo "BugId: " >> $msg
-        echo "$ignoreline" >> $msg
+        cat $LOG_TEMPLATE > $msg
+        printf "\n${ignoreline}\n" >> $msg
         for file in "$@"; do
             if [ -L "$file" ]; then

trunk/confmancommon.sh.in

@@ -31 +31 @@
 # Some global definitions. Defaults that can be overriden by options.
 DEFAULTS="@sysconfdefaultsdir@/confman.conf"
-GCONF="@sysconfdir@/confman.conf"
 UCONF="${HOME}/.confmanrc"
 MYNAME=`basename $0`

trunk/confmanlib.sh

@@ -28 +28 @@
 
 REPO_URI="${REPO_PROTOCOL}${REPO_HOSTNAME}${REPO_PATH}"
+REPO_TRUNK="${REPO_PROTOCOL}${REPO_HOSTNAME}${REPO_PATH}/trunk"
 REPO_ACTION="${REPO_DB}/last_action"
 REPO_SYNC_STATE="${REPO_DB}/state"
@@ -51 +52 @@
         chmod 700 ${WORK_PATH}
         
-        svn checkout ${REPO_URI} ${WORK_PATH}
+        svn checkout ${REPO_TRUNK} ${WORK_PATH}
         else
         svn update ${WORK_PATH}