messhy 0.6.0 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/messhy/configuration.rb +15 -1
- data/lib/messhy/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3c18cf7a1f81a44fc5b47d2298ad69ab13430044170f4b1b033fe95beaa89646
|
|
4
|
+
data.tar.gz: a4f74f4f4f38edb9ca76f88af0b52cc26eb9836eb04453d4fd2cbb19e037a9ae
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 33b0f5bb5cb1eb37e137f87e44c852a465b8feba911f2786b2e29db889172d4650d9adfd6745626f79f0f38cf8d5cb74afd23a9a3f9d3ca3eaaa8af2d1d8c4e0
|
|
7
|
+
data.tar.gz: a4e9f1057a0578bc338154f7c8a498a18a7b3aa563e42cb425ae860bd2a69fdca679ebc37660aa0f92d8e637490329e65866180e9d5117dfac25f58a61aedf57
|
data/lib/messhy/configuration.rb
CHANGED
|
@@ -71,7 +71,7 @@ module Messhy
|
|
|
71
71
|
end
|
|
72
72
|
|
|
73
73
|
if dns_enabled?
|
|
74
|
-
raise Error, 'DNS domain is required when dns is enabled' if
|
|
74
|
+
raise Error, 'DNS domain is required when dns is enabled' if dns_domains.empty?
|
|
75
75
|
raise Error, 'DNS servers are required when dns is enabled' if dns_server_nodes.empty?
|
|
76
76
|
raise Error, "Unsupported DNS provider: #{dns_provider}" unless %w[dnsmasq].include?(dns_provider)
|
|
77
77
|
|
|
@@ -108,10 +108,24 @@ module Messhy
|
|
|
108
108
|
end
|
|
109
109
|
|
|
110
110
|
def dns_domain
|
|
111
|
+
domains = dns_domains
|
|
112
|
+
return domains.first unless domains.empty?
|
|
113
|
+
|
|
111
114
|
value = @dns['domain'] || 'mesh'
|
|
112
115
|
value.to_s.strip
|
|
113
116
|
end
|
|
114
117
|
|
|
118
|
+
def dns_domains
|
|
119
|
+
domains = Array(@dns['domains']).map(&:to_s).map(&:strip).reject(&:empty?)
|
|
120
|
+
return domains unless domains.empty?
|
|
121
|
+
|
|
122
|
+
value = @dns['domain']
|
|
123
|
+
return [] if value.nil?
|
|
124
|
+
|
|
125
|
+
value = value.to_s.strip
|
|
126
|
+
value.empty? ? [] : [value]
|
|
127
|
+
end
|
|
128
|
+
|
|
115
129
|
def dns_interface
|
|
116
130
|
value = @dns['interface'] || 'wg0'
|
|
117
131
|
value.to_s.strip
|
data/lib/messhy/version.rb
CHANGED