aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:04:25 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:04:25 +0000
commit9b9b0666f8593bba45a7fdce1cdc76d6f5090c41 (patch)
tree8d073ee5736e4efd692859440a690f10c978ffbe
parent2287b34f3ef8bf672034f05a17e27aece4d17969 (diff)
downloadpuppet-9b9b0666f8593bba45a7fdce1cdc76d6f5090c41.tar
puppet-9b9b0666f8593bba45a7fdce1cdc76d6f5090c41.tar.gz
puppet-9b9b0666f8593bba45a7fdce1cdc76d6f5090c41.tar.bz2
puppet-9b9b0666f8593bba45a7fdce1cdc76d6f5090c41.tar.xz
puppet-9b9b0666f8593bba45a7fdce1cdc76d6f5090c41.zip
buildsystem: rename pkgsubmit to webstatus
Rename buildsystem::pkgsubmit to buildsystem::webstatus. pkgsubmit name has been used as the name of the host to submit packages, and the hostname of the web page to view the buildsystem status, but the two are different things, so they should be separated.
-rw-r--r--deployment/mga_buildsystem/manifests/mainnode.pp2
-rw-r--r--modules/buildsystem/manifests/webstatus.pp (renamed from modules/buildsystem/manifests/pkgsubmit.pp)4
-rw-r--r--modules/buildsystem/templates/vhost_webstatus.conf (renamed from modules/buildsystem/templates/vhost_pkgsubmit.conf)0
3 files changed, 3 insertions, 3 deletions
diff --git a/deployment/mga_buildsystem/manifests/mainnode.pp b/deployment/mga_buildsystem/manifests/mainnode.pp
index 89124bcb..f2797731 100644
--- a/deployment/mga_buildsystem/manifests/mainnode.pp
+++ b/deployment/mga_buildsystem/manifests/mainnode.pp
@@ -5,7 +5,7 @@ class mga_buildsystem::mainnode {
include buildsystem::maintdb
include buildsystem::binrepo
include buildsystem::repoctl
- include buildsystem::pkgsubmit
+ include buildsystem::webstatus
$rpmlint_packages = [ "rpmlint-mageia-policy", "rpmlint-mageia-mga2-policy"]
package { $rpmlint_packages:
diff --git a/modules/buildsystem/manifests/pkgsubmit.pp b/modules/buildsystem/manifests/webstatus.pp
index b2bcb829..9ed617ed 100644
--- a/modules/buildsystem/manifests/pkgsubmit.pp
+++ b/modules/buildsystem/manifests/webstatus.pp
@@ -1,4 +1,4 @@
-class buildsystem::pkgsubmit {
+class buildsystem::webstatus {
include buildsystem::var::scheduler
$sched_home_dir = $buildsystem::var::scheduler::homedir
@@ -13,7 +13,7 @@ class buildsystem::pkgsubmit {
'/autobuild/cauldron/x86_64/core/log/status.core.log' => "$location/autobuild/broken.php"
},
location => $location,
- content => template('buildsystem/vhost_pkgsubmit.conf'),
+ content => template('buildsystem/vhost_webstatus.conf'),
}
subversion::snapshot { $location:
diff --git a/modules/buildsystem/templates/vhost_pkgsubmit.conf b/modules/buildsystem/templates/vhost_webstatus.conf
index 4de14c17..4de14c17 100644
--- a/modules/buildsystem/templates/vhost_pkgsubmit.conf
+++ b/modules/buildsystem/templates/vhost_webstatus.conf