diff options
author | elijah <elijah@riseup.net> | 2014-02-09 17:04:58 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2014-02-09 17:04:58 -0800 |
commit | 665db30f37838bcebbfdc368f65ed369282c31b8 (patch) | |
tree | f916b0c1c131f701869b2b739f72f6668f09e16f /provider_base | |
parent | b9fa9cfc83d552faafe41ebba183fb06f45f6ca5 (diff) |
deploy a valid /etc/ssh/ssh_known_hosts for all nodes (requires new leap_cli)
Diffstat (limited to 'provider_base')
-rw-r--r-- | provider_base/common.json | 1 | ||||
-rw-r--r-- | provider_base/services/monitor.json | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index 07a45972..07a58bba 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -16,7 +16,6 @@ }, "ssh": { "authorized_keys": "= authorized_keys", - "known_hosts": "=> known_hosts_file", "port": 22, "mosh": { "ports": "60000:61000", diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json index cf117869..53e6b1f1 100644 --- a/provider_base/services/monitor.json +++ b/provider_base/services/monitor.json @@ -1,7 +1,7 @@ { "nagios": { "nagiosadmin_pw": "= secret :nagios_admin_password", - "hosts": "= nodes_like_me.pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')" + "hosts": "= nodes_like_me[:services => '!monitor'].pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')" }, "hosts": "= hosts_file(nodes_like_me[:services => '!monitor'])", "ssh": { |