summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-10-23 10:31:32 -0700
committerelijah <elijah@riseup.net>2012-10-23 10:31:32 -0700
commit3ff0d42f98ce12d9504ec853e483fde641f08f79 (patch)
tree6326889459b0bd0e0a6052a0603e87ba124efbe4
parent1f6840a0ac4b4276920ecfb909d980507bcd9136 (diff)
updated common.json
-rw-r--r--provider/common.json16
1 files changed, 9 insertions, 7 deletions
diff --git a/provider/common.json b/provider/common.json
index 35147ee..8f83558 100644
--- a/provider/common.json
+++ b/provider/common.json
@@ -3,16 +3,18 @@
#
{
"domain": {
- "public": "rewire.co",
- "internal": "rewire",
- "name": "= node.name + '.' + (dns.public ? domain.public : domain.internal)"
+ "full_suffix": "rewire.co",
+ "internal_suffix": "rewire",
+ "full": "= node.name + '.' + domain.full_suffix",
+ "internal": "= node.name + '.' + domain.internal_suffix",
+ "name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)"
},
"dns": {
"public": "= service_type != 'internal_service'"
},
- "ssh_pubkeys": {
- "admin": {
- "key": "ssh-rsa random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ"
- }
+ "ssh": {
+ "authorized_keys": "= file :authorized_keys",
+ "known_hosts": "= file :known_hosts",
+ "port": 22
}
}