Merge pull request #158 from SearchLightNZ/fix_client_attributes

Fix client attributes so that hashes and arrays work correctly
djjudas21 · May 14, 2021 · 7a43a76 · 7a43a76
2 parents 28c34bc + 8176e4b
commit 7a43a76
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/templates/client.conf.erb b/templates/client.conf.erb
@@ -45,13 +45,13 @@ client <%= @shortname %> {
 	}
 	<%- end -%>
 	<%- if defined?(@attributes) and [email protected]? -%>
-		<%- if defined?(@attributes).respond_to?('join') -%>
+		<%- if @attributes.respond_to?('join') -%>
 	<%= @attributes.join("\n  ") %>
-		<%- elsif defined?(@attributes).is_a?(Hash) -%>
+		<%- elsif @attributes.is_a?(Hash) -%>
 			<%- @attributes.sort.each do |k, v| -%>
 	<%= k %> = <%= v %>
 			<%- end -%>
-		<%- elsif defined?(@attributes) -%>
+		<%- else -%>
 	<%= @attributes %>
 		<%- end -%>
 	<%- end -%>