From 183c68facadc9fc8e4cd4f93581b16cf1ea8cc5e Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Thu, 23 May 2013 15:05:48 +0000
Subject: buildsystem: remove hardcoded repository hostname

Use $buildsystem::var::repository::hostname to store repository
hostname.
---
 modules/buildsystem/manifests/iurt/config.pp        | 1 +
 modules/buildsystem/manifests/iurt/upload.pp        | 1 +
 modules/buildsystem/manifests/mainnode.pp           | 2 +-
 modules/buildsystem/manifests/var/repository.pp     | 1 +
 modules/buildsystem/templates/iurt.conf             | 2 +-
 modules/buildsystem/templates/upload.conf           | 2 +-
 modules/buildsystem/templates/vhost_repository.conf | 2 +-
 7 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp
index 54bc03ea..32a48a4d 100644
--- a/modules/buildsystem/manifests/iurt/config.pp
+++ b/modules/buildsystem/manifests/iurt/config.pp
@@ -1,6 +1,7 @@
 define buildsystem::iurt::config() {
     include buildsystem::var::iurt
     include buildsystem::var::webstatus
+    include buildsystem::var::repository
     $distribution = $name
     # TODO rename the variable too in template
     $build_login = $buildsystem::var::iurt::login
diff --git a/modules/buildsystem/manifests/iurt/upload.pp b/modules/buildsystem/manifests/iurt/upload.pp
index 6aaef201..5417d36e 100644
--- a/modules/buildsystem/manifests/iurt/upload.pp
+++ b/modules/buildsystem/manifests/iurt/upload.pp
@@ -1,6 +1,7 @@
 class buildsystem::iurt::upload {
     include buildsystem::var::iurt
     include buildsystem::var::webstatus
+    include buildsystem::var::repository
     file { '/etc/iurt/upload.conf':
         require => File['/etc/iurt'],
         content => template('buildsystem/upload.conf'),
diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp
index 2a4834a0..1fd53900 100644
--- a/modules/buildsystem/manifests/mainnode.pp
+++ b/modules/buildsystem/manifests/mainnode.pp
@@ -11,7 +11,7 @@ class buildsystem::mainnode {
 
     ssh::auth::client { $buildsystem::var::scheduler::login: }
 
-    apache::vhost::other_app { "repository.$::domain":
+    apache::vhost::other_app { $buildsystem::var::repository::hostname:
         vhost_file => 'buildsystem/vhost_repository.conf',
     }
 }
diff --git a/modules/buildsystem/manifests/var/repository.pp b/modules/buildsystem/manifests/var/repository.pp
index 6407e69b..0ea1058c 100644
--- a/modules/buildsystem/manifests/var/repository.pp
+++ b/modules/buildsystem/manifests/var/repository.pp
@@ -1,4 +1,5 @@
 class buildsystem::var::repository(
+    $hostname = "repository.${::domain}",
     $bootstrap_root = '/distrib/bootstrap',
     $mirror_root = '/distrib/mirror',
     $distribdir = 'distrib'
diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf
index f29f598b..ef67e567 100644
--- a/modules/buildsystem/templates/iurt.conf
+++ b/modules/buildsystem/templates/iurt.conf
@@ -11,7 +11,7 @@
  upload => '<%= build_login %>@pkgsubmit:~/uploads/',
  upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
  unwanted_packages => '^monotone-',
- repository => 'http://repository.<%= domain %>/distrib/',
+ repository => 'http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/<%= scope.lookupvar('buildsystem::var::repository::distribdir') %>/',
  log_url => 'http://<%= scope.lookupvar('buildsystem::var::webstatus::hostname') %>/queue/build/',
  admin => 'mageia-sysadm@mageia.org',
  packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>',
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index 73274c79..61b72d7f 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -11,7 +11,7 @@ my %nodes = (
     i586 => [ qw(jonund0 ecosse0 jonund1 ecosse1) ],
     x86_64 => [ qw(ecosse0 jonund0 ecosse1 jonund1) ],
 );
-my $repository = "http://repository.<%= domain %>/distrib/";
+my $repository = "http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/<%= scope.lookupvar('buildsystem::var::repository::distribdir') %>/";
 my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>";
 
 {
diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf
index 5992284f..cc0e437a 100644
--- a/modules/buildsystem/templates/vhost_repository.conf
+++ b/modules/buildsystem/templates/vhost_repository.conf
@@ -7,7 +7,7 @@ mirror_root = scope.lookupvar('buildsystem::var::repository::mirror_root')
 %>
 
 <VirtualHost *:80>
-        ServerName repository.<%= @domain %>
+        ServerName <%= scope.lookupvar('buildsystem::var::repository::hostname') %>
         DocumentRoot <%= mirror_root %>
         Alias /distrib/infra_1/ "/distrib/bootstrap/distrib/infra_1/"
         Alias /distrib/infra_2/ "/distrib/bootstrap/distrib/infra_2/"
-- 
cgit v1.2.1