From 13cd7539c3e34d4caf7fec2ce1892f555e0f094f Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 3 May 2016 10:04:21 -0700 Subject: certs: switch everything to use lets encrypt ca by default, use the tag 'comodo' if using a comodo ca. --- nodes/alpaca.json | 2 +- nodes/diplocaulus.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'nodes') 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')" } } } -- cgit v1.2.3