harmonized generated file names; added default up/down script

vpngen.py

@@ -297,8 +297,7 @@ class VpnGen:
 
         files_paths = self.get_all_needed_files_paths(vpn_name, client_name)
         for file_path in files_paths:
-            split = os.path.splitext(file_path)
-            dest = "%s%s-%s%s" % (client_dir, os.path.basename(split[0]), vpn_name, split[1])
+            dest = "%s%s-%s-%s" % (client_dir, client_name, vpn_name, os.path.basename(file_path))
             shutil.copy(file_path, dest)
 
         split = os.path.splitext(client_conf_file)

vpngen/default/clients/client.conf

@@ -6,13 +6,15 @@ remote ${hostname} ${port}
 resolv-retry infinite
 cipher AES-256-CBC
 lladdr ${mac}
-ifconfig-noexec
+#ifconfig-noexec
+up ${client}-${name}-up.sh
+down ${client}-${name}-down.sh
 
 # Keys
-ca ca-${name}.crt
-cert ${client}-${name}.crt
-key ${client}-${name}.key
-tls-auth ta-${name}.key 1
+ca ${client}-${name}-ca.crt
+cert ${client}-${name}-${client}.crt
+key ${client}-${name}-${client}.key
+tls-auth ${client}-${name}-ta.key 1
 key-direction 1
 
 # Security
@@ -21,4 +23,4 @@ persist-key
 persist-tun
 comp-lzo
 verb 3
-
+script-security 2

vpngen/default/misc-files/down.sh

@@ -0,0 +1 @@
+#! /usr/bin/env sh

vpngen/default/misc-files/up.sh

@@ -0,0 +1 @@
+#! /usr/bin/env sh