diff options
author | elijah <elijah@riseup.net> | 2016-05-03 10:04:21 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2016-05-03 10:04:21 -0700 |
commit | 13cd7539c3e34d4caf7fec2ce1892f555e0f094f (patch) | |
tree | a0645003dd9095b5aff323d77874874af45abd0c /nodes | |
parent | 8d384c4f52fa41dd9d3c11ee99d3a36de6c20fd5 (diff) |
certs: switch everything to use lets encrypt ca by default, use the tag 'comodo' if using a comodo ca.
Diffstat (limited to 'nodes')
-rw-r--r-- | nodes/alpaca.json | 2 | ||||
-rw-r--r-- | nodes/diplocaulus.json | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nodes/alpaca.json b/nodes/alpaca.json index aa2669a..8e5272e 100644 --- a/nodes/alpaca.json +++ b/nodes/alpaca.json @@ -1,7 +1,7 @@ { "ip_address": "199.119.112.223", "services": ["webapp", "couchdb", "mx", "soledad"], - "tags": ["mail", "dc"], + "tags": ["mail", "dc", "comodo"], "webapp": { "customization_dir": "= file_path 'mail_webapp'" } diff --git a/nodes/diplocaulus.json b/nodes/diplocaulus.json index 210eeb9..ee05eda 100644 --- a/nodes/diplocaulus.json +++ b/nodes/diplocaulus.json @@ -20,9 +20,9 @@ } } }, - "cert": "= file [:commercial_cert, domain.full_suffix]", - "key": "= file [:commercial_key, domain.full_suffix]", - "ca_cert": "= try_file :commercial_ca_cert" + "cert": "= file('cert/bitmask.net.crt')", + "key": "= file('cert/bitmask.net.key')", + "ca_cert": "= file('cert/lets_encrypt_ca.crt')" } } } |