diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp index 0fd5b13..b7c16c5 100644 --- a/abusehelper/manifests/init.pp +++ b/abusehelper/manifests/init.pp @@ -8,8 +8,8 @@ class abusehelper { include svn::client svn::export { "/usr/local/src/abusehelper": - source => "http://abusehelper.googlecode.com/svn/trunk", - revision => $abusehelper_revision, + source => "http://abusehelper.googlecode.com/svn/trunk", + ensure => $abusehelper_revision, } python::setup::install { "/usr/local/src/abusehelper": diff --git a/svn/manifests/init.pp b/svn/manifests/init.pp index 39267cf..e501252 100644 --- a/svn/manifests/init.pp +++ b/svn/manifests/init.pp @@ -26,21 +26,21 @@ class svn::client { # Destination directory. # $source: # Source URL. -# $revision: +# $ensure: # Revision. Defaults to HEAD. # # === Sample usage # # svn::checkout { "/usr/local/src/graphingwiki": -# source => "http://svn.graphingwiki.webfactional.com/trunk", -# revision => "1959", +# source => "http://svn.graphingwiki.webfactional.com/trunk", +# ensure => "1959", # } # -define svn::checkout($source, $revision="HEAD") { +define svn::checkout($source, $ensure="HEAD") { exec { "svn-co-${name}": path => "/bin:/usr/bin:/sbin:/usr/sbin", - command => "svn checkout --non-interactive -r ${revision} ${source} ${name}", + command => "svn checkout --non-interactive -r ${ensure} ${source} ${name}", unless => "test -d ${name}", require => [ Package["subversion"], File["/etc/subversion/servers"], ], } @@ -48,10 +48,10 @@ define svn::checkout($source, $revision="HEAD") { exec { "svn-up-${name}": path => "/bin:/usr/bin:/sbin:/usr/sbin", cwd => "${name}", - command => "svn update --non-interactive -r ${revision}", - onlyif => $revision ? { + command => "svn update --non-interactive -r ${ensure}", + onlyif => $ensure ? { "HEAD" => "svn status --non-interactive -q -u 2>&1 | egrep '^[[:space:]]+\\*'", - default => "test $(svn info --non-interactive 2>&1 | awk '/^Revision:/ { print \$2 }') != ${revision}", + default => "test $(svn info --non-interactive 2>&1 | awk '/^Revision:/ { print \$2 }') != ${ensure}", }, require => Exec["svn-co-${name}"], } @@ -67,31 +67,31 @@ define svn::checkout($source, $revision="HEAD") { # Destination directory. # $source: # Source URL. -# $revision: +# $ensure: # Revision. Defaults to HEAD. # # === Sample usage # # svn::export { "/usr/local/src/graphingwiki": -# source => "http://svn.graphingwiki.webfactional.com/trunk/graphingwiki", -# revision => "1959", +# source => "http://svn.graphingwiki.webfactional.com/trunk/graphingwiki", +# ensure => "1959", # } # -define svn::export($source, $revision="HEAD") { +define svn::export($source, $ensure="HEAD") { exec { "svn-export-clean-${name}": path => "/bin:/usr/bin:/sbin:/usr/sbin", command => "rm -fr ${name}", - onlyif => $revision ? { + onlyif => $ensure ? { "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 ${ensure} != $(cat ${name}/.svnrevision)", }, require => [ Package["subversion"], File["/etc/subversion/servers"], ], } exec { "svn-export-${name}": path => "/bin:/usr/bin:/sbin:/usr/sbin", - command => "svn export --non-interactive -r ${revision} ${source} ${name} && svn info --non-interactive -r ${revision} ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }' > ${name}/.svnrevision", + command => "svn export --non-interactive -r ${ensure} ${source} ${name} && svn info --non-interactive -r ${ensure} ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }' > ${name}/.svnrevision", creates => "${name}", require => Exec["svn-export-clean-${name}"], } diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp index 9f74928..3e41f73 100644 --- a/wiki/manifests/init.pp +++ b/wiki/manifests/init.pp @@ -42,8 +42,8 @@ class wiki::graphingwiki::common { include svn::client svn::export { "/usr/local/src/graphingwiki": - source => "http://svn.graphingwiki.webfactional.com/trunk", - revision => $wiki_gwiki_revision, + source => "http://svn.graphingwiki.webfactional.com/trunk", + ensure => $wiki_gwiki_revision, } }