Ori.livneh has submitted this change and it was merged.
Change subject: tcpircbot: Correctly JSON-serialize array values
......................................................................
tcpircbot: Correctly JSON-serialize array values
Follows I0e0209e5c.
Change-Id: I9c250ca47bd3a7cdd3459cc0736a67257ef6173f
---
M modules/tcpircbot/templates/tcpircbot.json.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/tcpircbot/templates/tcpircbot.json.erb
b/modules/tcpircbot/templates/tcpircbot.json.erb
index 208b61c..4d2b1fd 100755
--- a/modules/tcpircbot/templates/tcpircbot.json.erb
+++ b/modules/tcpircbot/templates/tcpircbot.json.erb
@@ -1,13 +1,13 @@
{
"irc": {
- "channels": <%= @channels %>,
+ "channels": <%= @channels.to_pson %>,
"network": ["<%= @server_host %>", <%= @server_port %>, "<%= @nickname
%>:<%= @password %>"],
<% if @ssl %>"ssl": true,<% end %>
"nickname": "<%= @nickname %>"
},
"tcp": {
"max_clients": <%= @max_clients %>,
- <% if @cidr %>"cidr": <%= @cidr.is_a?(Array) ? @cidr : [@cidr] %>,<%
end %>
+ <% if @cidr %>"cidr": <%= @cidr.is_a?(Array) ? @cidr.to_pson :
[@cidr].to_pson %>,<% end %>
"port": <%= @listen_port %>
}
}
--
To view, visit https://gerrit.wikimedia.org/r/107809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c250ca47bd3a7cdd3459cc0736a67257ef6173f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
