Changeset 385

Timestamp:

07/04/2009 15:55:47 (3 years ago)

Author:

ccowart

Message:

• Disabling StrictHostKeyChecking?=no by default.
• Providing CONF_FETCH_SSH_FLAGS knob for arbitrary configuration of the ssh client.
• Renaming CONF_SSH_KEY to CONF_FETCH_SSH_KEY to more closely follow conventions.
• Related man page corrections.

Fixes #41

Location:

trunk

Files:

• confman.conf.5.in (modified) (1 diff)
• confman.conf.sample.in (modified) (1 diff)
• confmanlib.sh.in (modified) (1 diff)

trunk/confman.conf.5.in

@@ -97 +97 @@
 The export style to be used by
 .Xr confexport 8 . Valid options are: repository, module, recipe.
+.It CONF_FETCH_SSH_KEY
+This is a private SSH keyfile for use with "sftp://" and "scp://" URIs above.
+.It CONF_FETCH_SSH_FLAGS
+This options allows you to specify custom parameters to the 
+.Xr ssh 1
+client for
+.Cm confsync .
 .It CONF_SSH_KEY
-This is a private SSH keyfile for use with "sftp://" and "scp://" URIs above.
+This option is deprecated and will be removed in a future release. See 
+CONF_FETCH_SSH_KEY.
 .El
 .Ss MISCELLANEOUS OPTIONS

trunk/confman.conf.sample.in

@@ -25 +25 @@
 CONF_EXPORT_FILE="@localstatedir@/db/confman/export.tgz"
 CONF_EXPORT_URI="scp://confman@${REPO_HOSTNAME}${CONF_EXPORT_FILE}"
-CONF_SSH_KEY="/root/.ssh/id_rsa"
+CONF_FETCH_SSH_KEY="/root/.ssh/id_rsa"
+#CONF_FETCH_SSH_FLAGS="-o StrictHostKeyCHecking=no"
 

trunk/confmanlib.sh.in

@@ -221 +221 @@
             remote="${CONF_EXPORT_URI#*://}"
             remote="${remote/\//:/}"
-            scp -p -i ${CONF_SSH_KEY} -o StrictHostKeyCHecking=no \
-                "$remote$file" $tmpfile 
+
+            # XXX: Remove for confman-3.0
+            if [ -z "$CONF_FETCH_SSH_KEY" ] && [ -n "$CONF_SSH_KEY" ] ; then
+                CONF_FETCH_SSH_KEY="$CONF_SSH_KEY"
+                conf_warn "CONF_SSH_KEY is deprecated. Please define " \
+                    "CONF_FETCH_SSH_KEY instead."
+            fi
+
+            scp -p -i ${CONF_FETCH_SSH_KEY} ${CONF_FETCH_SSH_FLAGS} \
+                 "$remote$file" $tmpfile 
             ;;
         http|https|ftp)