- removed init- and config-files shipped with the openvpn package

- changed the description for the management port option
- changed PKI options from "Value" to "FileUpload"
- added "pkcs12" option to basic theme
- cleaned the recipes by removing defaults and adding
  approved config options we use for some years now.
- ... more to come.

1 files changed, 6 insertions, 5 deletions

diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
index cadf558bf7..1d4cc4d7ac 100644
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -42,11 +42,12 @@ local basicParams = {
 	{ Flag,			"client_to_client",		0 },
 	{ DynamicList,	"remote",				"vpnserver.example.org" },
 
-	{ Value,		"secret",				"/etc/openvpn/secret.key 1" },
-	{ Value,		"ca",					"/etc/easy-rsa/keys/ca.crt" },
-	{ Value,		"dh",					"/etc/easy-rsa/keys/dh1024.pem" },
-	{ Value,		"cert",					"/etc/easy-rsa/keys/some-client.crt" },
-	{ Value,		"key",					"/etc/easy-rsa/keys/some-client.key" },
+	{ FileUpload,	"secret",				"/etc/openvpn/secret.key 1" },
+	{ FileUpload,	"pkcs12",				"/etc/easy-rsa/keys/some-client.pk12" },
+	{ FileUpload,	"ca",					"/etc/easy-rsa/keys/ca.crt" },
+	{ FileUpload,	"dh",					"/etc/easy-rsa/keys/dh1024.pem" },
+	{ FileUpload,	"cert",					"/etc/easy-rsa/keys/some-client.crt" },
+	{ FileUpload,	"key",					"/etc/easy-rsa/keys/some-client.key" },
 }