summaryrefslogtreecommitdiff
path: root/provider_base/common.json
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-07-09 16:43:39 +0100
committerMicah Anderson <micah@riseup.net>2013-07-09 16:43:39 +0100
commitb4077083b971377636754b2988668a6ddd384da5 (patch)
treeb8e358b5f0f6dfa882d31d7446266111bc0d201b /provider_base/common.json
parent625aaa11138bba365958391664299692402f8da4 (diff)
parent672154a8322901b86c9882854234eae53221a38e (diff)
Merge remote-tracking branch 'origin/develop'0.2.2
Conflicts: provider_base/services/webapp.json
Diffstat (limited to 'provider_base/common.json')
-rw-r--r--provider_base/common.json15
1 files changed, 10 insertions, 5 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index e674edb6..2313bd8b 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -1,5 +1,6 @@
{
"ip_address": null,
+ "environment": null,
"services": [],
"tags": [],
"domain": {
@@ -13,9 +14,13 @@
"public": "= service_type != 'internal_service'"
},
"ssh": {
- "authorized_keys": "= file :authorized_keys",
+ "authorized_keys": "= authorized_keys",
"known_hosts": "=> known_hosts_file",
- "port": 22
+ "port": 22,
+ "mosh": {
+ "ports": "60000:61000",
+ "enabled": false
+ }
},
"hosts": "=> hosts_file",
"x509": {
@@ -24,11 +29,11 @@
"key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap cert update`') : nil",
"ca_cert": "= try_file :ca_cert"
},
- "local": false,
- "production": false,
"service_type": "internal_service",
"development": {
"site_config": true
},
- "name": "common"
+ "name": "common",
+ "location": null,
+ "enabled": true
}