tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't create svn proxy config if proxy variable is unset

Browse source
This commit is contained in:
Ossi Salmi 2012-12-05 13:13:36 +02:00
parent 2b9e847b22
commit 769e584977
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
svn/manifests/init.pp
View file

@ -7,7 +7,10 @@ class svn {
} }
file { "/etc/subversion/servers": file { "/etc/subversion/servers":
ensure => present, ensure => $http_proxy ? {
"" => absent,
default => present,
},
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",

10
svn/templates/servers.erb
View file

@ -1,11 +1,7 @@
[global]
<% <%
if has_variable?("http_proxy") http_proxy_host, http_proxy_port = http_proxy.split(":")
http_proxy_host, http_proxy_port = http_proxy.split(":") http_proxy_port = "80" if http_proxy_port.nil?
http_proxy_port = "80" if http_proxy_port.nil?
-%> -%>
<% end -%> [global]
<% if http_proxy_host and http_proxy_port -%>
http-proxy-host = <%= http_proxy_host %> http-proxy-host = <%= http_proxy_host %>
http-proxy-port = <%= http_proxy_port %> http-proxy-port = <%= http_proxy_port %>
<% end -%>