diff options
| author | elijah <elijah@riseup.net> | 2016-04-08 12:41:45 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-04-08 12:41:45 -0700 |
| commit | e4f786e229c101cb60626ce23e671c5258466724 (patch) | |
| tree | 40dadd2472462c05e731c7685db819d40b18c026 /provider_base | |
| parent | 8dfb90f0ea7364f43669fe2105c6a031066b468f (diff) | |
partials - add support for leap_cli's inheritable service partials (requires latest develop branch leap_cli)
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/services/monitor.json | 2 | ||||
| -rw-r--r-- | provider_base/services/mx.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json index 28fb837c..9ddc0ec7 100644 --- a/provider_base/services/monitor.json +++ b/provider_base/services/monitor.json @@ -2,7 +2,7 @@ "nagios": { "nagiosadmin_pw": "= secret :nagios_admin_password", "domains_internal": "= nagios.hosts.values.map{|h|h['domain_internal_suffix']}.uniq", - "environments": "= Hash[ nagios.hosts.values.map{|h|h['environment']}.uniq.map{|e| [e||'default',{'contact_emails'=>global.env(e).provider.contacts.default}]} ]", + "environments": "= Hash[ nagios.hosts.values.map{|h|h['environment']}.uniq.map{|e| [e||'default',{'contact_emails'=>manager.env(e).provider.contacts.default}]} ]", "hosts": "= (self.environment == 'local' ? nodes_like_me : nodes[:environment => '!local']).pick_fields('environment', 'domain.internal', 'domain.internal_suffix', 'domain.full_suffix', 'ip_address', 'services', 'openvpn.gateway_address', 'ssh.port')" }, "hosts": "= self.environment == 'local' ? hosts_file(nodes_like_me) : hosts_file(nodes[:environment => '!local'])", diff --git a/provider_base/services/mx.rb b/provider_base/services/mx.rb index 741ff313..03ee561f 100644 --- a/provider_base/services/mx.rb +++ b/provider_base/services/mx.rb @@ -1 +1 @@ -apply_partial('services/_api_tester.json') +apply_partial('_api_tester') |