Revision b57e9250
Added by Eric Helms almost 10 years ago
| templates/puppet_importer.json | ||
|---|---|---|
|
{
|
||
|
<%- if @proxy_url %>
|
||
|
"proxy_host": "<%= @proxy_url %>",
|
||
|
<% end %>
|
||
|
<%- if @proxy_port %>
|
||
|
"proxy_port": "<%= @proxy_port %>",
|
||
|
<% end %>
|
||
|
<%- if @proxy_username %>
|
||
|
"proxy_username": "<%= @proxy_username %>",
|
||
|
<% end %>
|
||
|
<%- if @proxy_password %>
|
||
|
"proxy_password": "<%= @proxy_password %>"
|
||
|
<% end %>
|
||
|
}
|
||
Also available in: Unified diff
Fixes #6530: Ensure proxy configs work if not all values specified.
If only host or port were specified, a trailing coma resulted in the
configs causing Pulp to fail to start since the JSON was considered
invalid.