diff options
4 files changed, 8 insertions, 3 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 7ccd4bee..31cbe195 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -29,11 +29,13 @@ class mga_buildsystem::config { $svn_hostname = "svn.$::domain" $svn_root_packages = "svn://${svn_hostname}/svn/packages" + $svn_root_packages_ssh = "svn+ssh://${svn_hostname}/svn/packages" class { 'buildsystem::var::mgarepo': submit_host => "pkgsubmit.${::domain}", svn_hostname => $svn_hostname, svn_root_packages => $svn_root_packages, - oldurl => "svn+ssh://svn.${::domain}/svn/packages/misc", + svn_root_packages_ssh => $svn_root_packages_ssh, + oldurl => "${svn_root_packages_ssh}/misc", conf => { 'global' => { 'ldap-server' => "ldap.${::domain}", diff --git a/modules/buildsystem/manifests/var/mgarepo.pp b/modules/buildsystem/manifests/var/mgarepo.pp index 52f9d9cc..9099c7ee 100644 --- a/modules/buildsystem/manifests/var/mgarepo.pp +++ b/modules/buildsystem/manifests/var/mgarepo.pp @@ -4,6 +4,8 @@ # hostname of the svn server used for packages # $svn_root_packages: # svn root url of the svn repository for packages +# $svn_root_packages_ssh: +# svn+ssh root url of the svn repository for packages # $oldurl: # svn url where the import logs of the rpm are stored # $conf: @@ -13,6 +15,7 @@ class buildsystem::var::mgarepo( $submit_host, $svn_hostname, $svn_root_packages, + $svn_root_packages_ssh, $oldurl, $conf ) { diff --git a/modules/buildsystem/templates/youri/submit-todo.conf b/modules/buildsystem/templates/youri/submit-todo.conf index af126712..a575602e 100644 --- a/modules/buildsystem/templates/youri/submit-todo.conf +++ b/modules/buildsystem/templates/youri/submit-todo.conf @@ -16,7 +16,7 @@ repository: upload_state: todo done queue queue: todo noarch: i586 - svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ + svn: <%= scope.lookupvar('buildsystem::var::mgarepo::svn_root_packages_ssh') %>/<%= scope.lookupvar('buildsystem::var::distros::default_distro') %>/ 2: arch: i586 x86_64 1: diff --git a/modules/buildsystem/templates/youri/submit-upload.conf b/modules/buildsystem/templates/youri/submit-upload.conf index fdd8fd63..305de6cd 100644 --- a/modules/buildsystem/templates/youri/submit-upload.conf +++ b/modules/buildsystem/templates/youri/submit-upload.conf @@ -18,7 +18,7 @@ repository: upload_state: queue queue: queue noarch: i586 - svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ + svn: <%= scope.lookupvar('buildsystem::var::mgarepo::svn_root_packages_ssh') %>/<%= scope.lookupvar('buildsystem::var::distros::default_distro') %>/ 2: arch: i586 x86_64 1: |