diff options
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/files/service-definitions/provider.json.erb | 4 | ||||
| -rw-r--r-- | provider_base/services/openvpn.json | 3 | ||||
| -rw-r--r-- | provider_base/services/tor.json | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index 97454f81..3e055e9a 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -1,13 +1,13 @@ <%= # grab some fields from provider.json hsh = provider.pick( - :languages, :description, :name, + :languages, :description, :name, :services, :enrollment_policy, :default_language, :service ) hsh['domain'] = domain.full_suffix # advertise services that are 'user services' and for which there are actually nodes - hsh['services'] = global.services[:service_type => :user_service].field(:name).select do |service| + hsh['services'] ||= global.services[:service_type => :user_service].field(:name).select do |service| nodes_like_me[:services => service].any? end diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json index 6d20cf3e..04e19aa2 100644 --- a/provider_base/services/openvpn.json +++ b/provider_base/services/openvpn.json @@ -22,7 +22,8 @@ "configuration": { "tls-cipher": "DHE-RSA-AES128-SHA", "auth": "SHA1", - "cipher": "AES-128-CBC" + "cipher": "AES-128-CBC", + "keepalive": "10 30" } } } diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json index ed75285c..ae4da46d 100644 --- a/provider_base/services/tor.json +++ b/provider_base/services/tor.json @@ -1,6 +1,6 @@ { "tor": { "bandwidth_rate": 6550, - "contacts": "= provider.contacts['tor'] || provider.contacts.default" + "contacts": "= [provider.contacts['tor'] || provider.contacts.default].flatten" } } |