diff options
author | elijah <elijah@riseup.net> | 2012-11-06 23:46:57 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2012-11-06 23:46:57 -0800 |
commit | 96634bb77059ca074a4713e0d143c99266b4d55f (patch) | |
tree | 75b172b5478c5cb29b356dd025492cf2a21268f9 /test/provider/common.json | |
parent | 68674e6d2d85ca42e0d56a63f3ea2441c7e7e992 (diff) |
updated test/provider and added configurable life_span to CA.
Diffstat (limited to 'test/provider/common.json')
-rw-r--r-- | test/provider/common.json | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/provider/common.json b/test/provider/common.json index 9e19836..7504e86 100644 --- a/test/provider/common.json +++ b/test/provider/common.json @@ -3,8 +3,8 @@ # { "domain": { - "full_suffix": "rewire.co", - "internal_suffix": "rewire", + "full_suffix": "= global.provider.domain", + "internal_suffix": "= global.provider.internal_domain", "full": "= node.name + '.' + domain.full_suffix", "internal": "= node.name + '.' + domain.internal_suffix", "name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)" @@ -16,10 +16,10 @@ "authorized_keys": "= file :authorized_keys", "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" } - #"x509": { - # "use": false, - # "cert": "= x509.use ? file(:node_x509_cert) : nil", - # "key": "= x509.use ? file(:node_x509_key) : nil" - #} } |