Custom ovpn, pkg template

Author: SloCompTech

root/usr/local/bin/ovpn

@@ -18,8 +18,8 @@ function usage() {
   echo '      rm|del  # Remove PKI'
   echo '  restore [file] # Restore config'
   echo '  subject add NAME {client|server} [nopass] [easy-rsa args]'
-  echo '          gen-ovpn SUBNAME [file] # Generate .ovpn file'
-  echo '          gen-pkg SUBNAME [file] # Generate config package'
+  echo '          gen-ovpn SUBNAME [file] # Generate .ovpn file (TEMPLATE=<custom template in openvpn dir)'
+  echo '          gen-pkg SUBNAME [file] # Generate config package (TEMPLATE=<custom template in openvpn dir)'
   echo '          import-req FILE # Import signing request'
   echo '          renew SUBNAME {client|server} [easy-rsa args]'
   echo '          revoke SUBNAME'

root/usr/local/bin/ovpn-subject

@@ -36,8 +36,9 @@ function generate_ovpn() {
   fi
 
   # Start with client config template if it exist
-  if [ -f "$OPENVPN_DIR/openvpn-template.conf" ]; then
-    $RUNCMD bash -c "cat $OPENVPN_DIR/openvpn-template.conf > $OVPN_FILE"
+  TEMPLATE=${TEMPLATE:='openvpn-template.conf'}
+  if [ -f "$OPENVPN_DIR/$TEMPLATE" ]; then
+    $RUNCMD bash -c "cat $OPENVPN_DIR/$TEMPLATE > $OVPN_FILE"
   else
     $RUNCMD touch $OVPN_FILE
   fi
@@ -122,8 +123,9 @@ function generate_pkg() {
   $RUNCMD mkdir -p $TMP_DIR/openvpn
 
   # Start with client config template if it exist
-  if [ -f "$OPENVPN_DIR/openvpn-template.conf" ]; then
-    $RUNCMD bash -c "cat $OPENVPN_DIR/openvpn-template.conf > $TMP_CONFIG"
+  TEMPLATE=${TEMPLATE:='openvpn-template.conf'}
+  if [ -f "$OPENVPN_DIR/$TEMPLATE" ]; then
+    $RUNCMD bash -c "cat $OPENVPN_DIR/$TEMPLATE > $TMP_CONFIG"
   else
     $RUNCMD touch $TMP_CONFIG
   fi