Added http proxy support to svn module
This commit is contained in:
parent
197d9389b4
commit
b280208ee9
2 changed files with 20 additions and 1 deletions
|
@ -6,6 +6,15 @@ class svn::client {
|
||||||
ensure => installed,
|
ensure => installed,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
file { "/etc/subversion/servers":
|
||||||
|
ensure => present,
|
||||||
|
mode => 0644,
|
||||||
|
owner => root,
|
||||||
|
group => root,
|
||||||
|
content => template("svn/servers.erb"),
|
||||||
|
require => Package["subversion"],
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -33,7 +42,7 @@ define svn::checkout($source, $revision="HEAD") {
|
||||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||||
command => "svn checkout --non-interactive -r ${revision} ${source} ${name}",
|
command => "svn checkout --non-interactive -r ${revision} ${source} ${name}",
|
||||||
unless => "test -d ${name}",
|
unless => "test -d ${name}",
|
||||||
require => Package["subversion"],
|
require => [ Package["subversion"], File["/etc/subversion/servers"], ],
|
||||||
}
|
}
|
||||||
|
|
||||||
exec { "svn-up-${name}":
|
exec { "svn-up-${name}":
|
||||||
|
@ -77,6 +86,7 @@ define svn::export($source, $revision="HEAD") {
|
||||||
"HEAD" => "test -r ${name}/.svnrevision && test $(svn info --non-interactive ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }') != $(cat ${name}/.svnrevision)",
|
"HEAD" => "test -r ${name}/.svnrevision && test $(svn info --non-interactive ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }') != $(cat ${name}/.svnrevision)",
|
||||||
default => "test -r ${name}/.svnrevision && test ${revision} != $(cat ${name}/.svnrevision)",
|
default => "test -r ${name}/.svnrevision && test ${revision} != $(cat ${name}/.svnrevision)",
|
||||||
},
|
},
|
||||||
|
require => [ Package["subversion"], File["/etc/subversion/servers"], ],
|
||||||
}
|
}
|
||||||
|
|
||||||
exec { "svn-export-${name}":
|
exec { "svn-export-${name}":
|
||||||
|
|
9
svn/templates/servers.erb
Normal file
9
svn/templates/servers.erb
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
[global]
|
||||||
|
<%
|
||||||
|
if has_variable?("http_proxy")
|
||||||
|
http_proxy_host, http_proxy_port = http_proxy.split(":")
|
||||||
|
http_proxy_port = "80" if http_proxy_port.nil?
|
||||||
|
-%>
|
||||||
|
http-proxy-host = <%= http_proxy_host %>
|
||||||
|
http-proxy-port = <%= http_proxy_port %>
|
||||||
|
<% end -%>
|
Loading…
Add table
Reference in a new issue