From 9b9b0666f8593bba45a7fdce1cdc76d6f5090c41 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Thu, 23 May 2013 15:04:25 +0000 Subject: 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. --- modules/buildsystem/manifests/pkgsubmit.pp | 22 ---------------------- modules/buildsystem/manifests/webstatus.pp | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 modules/buildsystem/manifests/pkgsubmit.pp create mode 100644 modules/buildsystem/manifests/webstatus.pp (limited to 'modules/buildsystem/manifests') diff --git a/modules/buildsystem/manifests/pkgsubmit.pp b/modules/buildsystem/manifests/pkgsubmit.pp deleted file mode 100644 index b2bcb829..00000000 --- a/modules/buildsystem/manifests/pkgsubmit.pp +++ /dev/null @@ -1,22 +0,0 @@ -class buildsystem::pkgsubmit { - include buildsystem::var::scheduler - $sched_home_dir = $buildsystem::var::scheduler::homedir - - $location = '/var/www/bs' - file { [$location,"$location/data"]: - ensure => directory, - } - - apache::vhost::base { "pkgsubmit.$::domain": - aliases => { - '/uploads' => "$sched_home_dir/uploads", - '/autobuild/cauldron/x86_64/core/log/status.core.log' => "$location/autobuild/broken.php" - }, - location => $location, - content => template('buildsystem/vhost_pkgsubmit.conf'), - } - - subversion::snapshot { $location: - source => "svn://svn.$::domain/soft/buildsystem/web/", - } -} diff --git a/modules/buildsystem/manifests/webstatus.pp b/modules/buildsystem/manifests/webstatus.pp new file mode 100644 index 00000000..9ed617ed --- /dev/null +++ b/modules/buildsystem/manifests/webstatus.pp @@ -0,0 +1,22 @@ +class buildsystem::webstatus { + include buildsystem::var::scheduler + $sched_home_dir = $buildsystem::var::scheduler::homedir + + $location = '/var/www/bs' + file { [$location,"$location/data"]: + ensure => directory, + } + + apache::vhost::base { "pkgsubmit.$::domain": + aliases => { + '/uploads' => "$sched_home_dir/uploads", + '/autobuild/cauldron/x86_64/core/log/status.core.log' => "$location/autobuild/broken.php" + }, + location => $location, + content => template('buildsystem/vhost_webstatus.conf'), + } + + subversion::snapshot { $location: + source => "svn://svn.$::domain/soft/buildsystem/web/", + } +} -- cgit v1.2.1