add option, improve error handling

[vpn-setup] / vpn-mk-client-cert

diff --git a/vpn-mk-client-cert b/vpn-mk-client-cert
index 1aa9b4166aca033059b65b25328c829a68677b15..78db36ee58ef52e3149897c32926c3cd79c2f41f 100755 (executable)
--- a/vpn-mk-client-cert
+++ b/vpn-mk-client-cert
@@ -25,16 +25,19 @@ usage() {
   cat <<'EOF'
 usage: ${0##*/} VPN_SERVER_HOST
 
--b COMMON_NAME   By default, use $HOSTNAME or $CLIENT_HOST. If the cert
-                 already exists on the server, with the CLIENT_NAME
-                 name, we use the existing one. See comment below if we
-                 ever want to check existing common names. They must be
-                 unique per server, so you can use $(uuidgen) if
-                 needed. You used to be able to create multiple with the
-                 same name, but not connect at the same time, but now,
-                 the generator keeps track, so you can't generate.
--c CLIENT_HOST   default is localhost. Else we ssh to root@CLIENT_HOST
+-b COMMON_NAME   By default, use $CLIENT_HOST or if it is not given,
+                 $HOSTNAME. If the cert already exists on the server,
+                 with the CLIENT_NAME name, we use the existing one. See
+                 comment below if we ever want to check existing common
+                 names. They must be unique per server, so you can use
+                 $(uuidgen) if needed. You used to be able to create
+                 multiple with the same name, but not connect at the
+                 same time, but now, the generator keeps track, so you
+                 can't generate.
+
+-c CLIENT_HOST   Default is localhost. Else we ssh to root@CLIENT_HOST.
 -n CONFIG_NAME   default is client
+-o SERVER_CONFIG_NAME  Default is CONFIG_NAME
 -s SCRIPT_PATH   Use custom up/down script at SCRIPT_PATH. copied to same path
                  on client, if client is not localhost.
 
@@ -65,13 +68,14 @@ custom_script=false
 script=/etc/openvpn/update-resolv-conf
 client_host=$CLIENT_HOST
 
-temp=$(getopt -l help hb:c:n:s: "$@") || usage 1
+temp=$(getopt -l help hb:c:n:o:s: "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
     -b) common_name="$2"; shift 2 ;;
     -c) client_host=$2; shell="ssh root@$client_host"; shift 2 ;;
     -n) name="$2"; shift 2 ;;
+    -o) server_name="$2"; shift 2 ;;
     -s) custom_script=true; script="$2"; shift 2 ;;
     -h|--help) usage ;;
     --) shift; break ;;
@@ -79,6 +83,10 @@ while true; do
   esac
 done
 
+if [[ ! $server_name ]]; then
+  server_name="$name"
+fi
+
 if [[ ! $common_name ]]; then
   if [[ $client_host ]]; then
     common_name=$client_host
@@ -92,12 +100,13 @@ host=$1
 
 ####### end command line parsing and checking ##############
 
-
 # bash or else we get motd spam. note sleep 2, sleep 1 failed.
-if ! ssh root@$host bash -s -- $name $common_name < client-cert-helper \
+$shell '[[ -e /etc/openvpn ]] || apt install openvpn'
+if ! ssh root@$host bash -s -- $server_name $common_name < client-cert-helper \
     |  $shell 'id -u | grep -xF 0 || s=sudo; $s tar xzv -C /etc/openvpn/client'; then
   echo ssh root@$host cat /tmp/vpn-mk-client-cert.log:
   ssh root@$host cat /tmp/vpn-mk-client-cert.log
+  echo EOF for root@$host:/tmp/vpn-mk-client-cert.log
   exit 1
 fi