x.509 support -- added certificate authority creation and server cert creation

3 files changed, 16 insertions, 3 deletions

diff --git a/test/provider/common.json b/test/provider/common.json
index 8f83558..9e19836 100644
--- a/test/provider/common.json
+++ b/test/provider/common.json
@@ -17,4 +17,9 @@
     "known_hosts": "= file :known_hosts",
     "port": 22
   }
+  #"x509": {
+  #  "use": false,
+  #  "cert": "= x509.use ? file(:node_x509_cert) : nil",
+  #  "key": "= x509.use ? file(:node_x509_key) : nil"
+  #}
 }
diff --git a/test/provider/provider.json b/test/provider/provider.json
index 4e8bb34..d4153a6 100644
--- a/test/provider/provider.json
+++ b/test/provider/provider.json
@@ -13,7 +13,12 @@
   "enrollment_policy": "open",
   "ca": {
     "name": "Rewire Root CA",
-    "organization": "#{name}",
-    "bit_size": 4096
+    "organization": "= global.provider.name[global.provider.default_language]",
+    "organizational_unit": "= 'https://' + global.common.domain.full_suffix",
+    "bit_size": 4096,
+    "server_certificates": {
+      "bit_size": 3248,
+      "life_span": "1y"
+    }
   }
 }
\ No newline at end of file
diff --git a/test/provider/services/openvpn.json b/test/provider/services/openvpn.json
index 86d6c14..629c5b7 100644
--- a/test/provider/services/openvpn.json
+++ b/test/provider/services/openvpn.json
@@ -5,9 +5,12 @@
     "nat": true,
     "ca_crt": "= file 'ca/ca.crt'",
     "ca_key": "= file 'ca/ca.key'",
-    "dh_key": "= file 'ca/dh.key'",
+    "dh": "= file 'ca/dh.pem'",
     "server_crt": "= file domain.name + '.crt'",
     "server_key": "= file domain.name + '.key'"
   },
   "service_type": "user_service"
+  #"x509": {
+  #  "use": true
+  #}
 }