summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-10-18 12:26:14 -0700
committerelijah <elijah@riseup.net>2012-10-18 12:26:14 -0700
commitdc12fc65138eba1305f6088ff132ee8edc22ac5e (patch)
tree6b1d9a4ff5a3151460573b051a1c1bc167ca2563 /test
parentc6d2272ddb370b9731e17b06fa08971e6cda5202 (diff)
parent43fce8add934413838a54e2ed27ccf8a643906aa (diff)
Merge branch 'master' of ssh://leap.se/leap_cli
Diffstat (limited to 'test')
-rw-r--r--test/provider/common.json5
-rw-r--r--test/provider/files/ca/dh.key9
-rw-r--r--test/provider/services/openvpn.json1
3 files changed, 15 insertions, 0 deletions
diff --git a/test/provider/common.json b/test/provider/common.json
index 6b1488e..35147ee 100644
--- a/test/provider/common.json
+++ b/test/provider/common.json
@@ -9,5 +9,10 @@
},
"dns": {
"public": "= service_type != 'internal_service'"
+ },
+ "ssh_pubkeys": {
+ "admin": {
+ "key": "ssh-rsa random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ"
+ }
}
}
diff --git a/test/provider/files/ca/dh.key b/test/provider/files/ca/dh.key
new file mode 100644
index 0000000..190e39e
--- /dev/null
+++ b/test/provider/files/ca/dh.key
@@ -0,0 +1,9 @@
+-----BEGIN DH PARAMETERS-----
+MIIBOAKCATEAuk7D6dsadjJpiW97APv/cjqYBEMCfGIaQMCfaB42VBw3Bk0yfgpA
+ItvhY6gJHK+LIXlQLuOgfCFu7N4Ny0wP9lMi4Q2de2t9uyabzYRFnK+42WA5LKag
+57xErne+RgIgmGpwKkRAa8BGmghy+wKg2/Tmsw+EMOHqQL5TtnDbcNuNKDHyahST
+sw0Chew1esitR+KgY6MJJFdyV3/sGQaGa1Y2vw2rn9a+6HWGZLmzcUcYNwMCIqTL
+h9gFk2JvnDs1cO+dsN/XDV8BjsEtnarXB6OOVgQzclfcGuqM2/9mVfeEQiowYqMk
+ot9gDeUZVwDqmqh2+sG9q83BEp+AsnQIIerju8URmgIXYTJw7i6IX2vXKqUm96za
+IBeGmS71ZSsmgABITDbYenqnvw2A938bEwIBBQ==
+-----END DH PARAMETERS-----
diff --git a/test/provider/services/openvpn.json b/test/provider/services/openvpn.json
index e7e8150..86d6c14 100644
--- a/test/provider/services/openvpn.json
+++ b/test/provider/services/openvpn.json
@@ -5,6 +5,7 @@
"nat": true,
"ca_crt": "= file 'ca/ca.crt'",
"ca_key": "= file 'ca/ca.key'",
+ "dh_key": "= file 'ca/dh.key'",
"server_crt": "= file domain.name + '.crt'",
"server_key": "= file domain.name + '.key'"
},