aboutsummaryrefslogtreecommitdiff
path: root/share/keyringer/newkeys
diff options
context:
space:
mode:
Diffstat (limited to 'share/keyringer/newkeys')
-rwxr-xr-xshare/keyringer/newkeys15
1 files changed, 3 insertions, 12 deletions
diff --git a/share/keyringer/newkeys b/share/keyringer/newkeys
index c7eb562..eff529e 100755
--- a/share/keyringer/newkeys
+++ b/share/keyringer/newkeys
@@ -3,14 +3,6 @@
# Create keys for new nodes.
#
-# Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
-source $LIB
-keyringer_set_env $*
-
-# Aditional parameters
-COMMAND="$2"
-
function newkeys_nodes {
# See http://www.mail-archive.com/puppet-users@googlegroups.com/msg01615.html
grep ^node $* | sed -e 's/^node //' | awk -F, '{for(i=1;i<=NF;i++) {print $i}}' | cut -d "'" -f2
@@ -45,11 +37,10 @@ function newkeys_puppet {
# Load functions
LIB="`dirname $0`/../../lib/keyringer"
source $LIB/functions
+keyringer_set_env $*
-if [ -z "$COMMAND" ]; then
- echo "Usage: keyringer <keyring> `basename $0` <command> [arguments]"
- exit 1
-fi
+# Command parser
+keyringer_get_command $2
source $OPTIONS
keyringer_config_load_preferences