From e134a6f3b17c501df2db447bedbbb83c20f596e5 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 7 Dec 2014 13:21:35 +0100 Subject: Fix internal domain name generation (#6477) Before, under certain circumstances, the internal domain names were capped from i.e. 'dev.example.com' to 'dev.i' Change-Id: Ibd4998a7ba128dcbce5ccb9d0a52006ed4431f01 --- provider_base/provider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider_base/provider.json b/provider_base/provider.json index 9ef0f76a..77437935 100644 --- a/provider_base/provider.json +++ b/provider_base/provider.json @@ -1,6 +1,6 @@ { "domain": "REQUIRED", - "domain_internal": "= domain.sub(/\\..*$/,'.i')", + "domain_internal": "= domain.sub(/\\.[^\\.]*$/, '.i')", "name": { "en": "REQUIRED" }, -- cgit v1.2.3 From 7871852a39bf59947b25184e6c6df365ba3b5052 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 10 Dec 2014 15:52:50 +0100 Subject: https://leap.se/code/issues/6477#note-11 Change-Id: I3094be3ef60108f4f2cad5239b0b2f288b39620d --- provider_base/services/monitor.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json index ff3a27a3..10d5ac81 100644 --- a/provider_base/services/monitor.json +++ b/provider_base/services/monitor.json @@ -1,9 +1,9 @@ { "nagios": { "nagiosadmin_pw": "= secret :nagios_admin_password", - "domains_internal": "= global.tags.field('domain.internal_suffix').compact.uniq", + "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}]} ]", - "hosts": "= (self.environment == 'local' ? nodes_like_me : nodes[:environment => '!local']).pick_fields('environment', 'domain.internal', 'domain.full_suffix', 'ip_address', 'services', 'openvpn.gateway_address', 'ssh.port')" + "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'])", "ssh": { -- cgit v1.2.3