diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-25 12:47:26 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-25 12:47:26 +0000 |
| commit | c7b761dabd635dc581322d8be0832a5da9ff8b99 (patch) | |
| tree | db853f6b2442013f264efd69e056e28953083280 /modules/buildsystem | |
| parent | cc807e7c63668180a38f62fd7b1b01a0333e4e20 (diff) | |
| download | puppet-c7b761dabd635dc581322d8be0832a5da9ff8b99.tar puppet-c7b761dabd635dc581322d8be0832a5da9ff8b99.tar.gz puppet-c7b761dabd635dc581322d8be0832a5da9ff8b99.tar.bz2 puppet-c7b761dabd635dc581322d8be0832a5da9ff8b99.tar.xz puppet-c7b761dabd635dc581322d8be0832a5da9ff8b99.zip | |
fix vhost invocation on several module, was missed by last commit, and add the one for redirect_ssl
Diffstat (limited to 'modules/buildsystem')
| -rw-r--r-- | modules/buildsystem/manifests/binrepo.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/maintdb.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/pkgsubmit.pp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp index 195843df..661ee10c 100644 --- a/modules/buildsystem/manifests/binrepo.pp +++ b/modules/buildsystem/manifests/binrepo.pp @@ -34,7 +34,7 @@ class buildsystem::binrepo { content => template('buildsystem/binrepo/sudoers.binrepo') } - apache::vhost_base { "binrepo.$::domain": + apache::vhost::base { "binrepo.$::domain": location => $repodir, content => template('buildsystem/binrepo/vhost_binrepo.conf'), } diff --git a/modules/buildsystem/manifests/maintdb.pp b/modules/buildsystem/manifests/maintdb.pp index bbde4deb..d6eb25bc 100644 --- a/modules/buildsystem/manifests/maintdb.pp +++ b/modules/buildsystem/manifests/maintdb.pp @@ -47,7 +47,7 @@ class buildsystem::maintdb { require => User[$login], } - apache::vhost_base { "maintdb.$::domain": + apache::vhost::base { "maintdb.$::domain": location => $dbdir, content => template('buildsystem/maintdb/vhost_maintdb.conf'), } diff --git a/modules/buildsystem/manifests/pkgsubmit.pp b/modules/buildsystem/manifests/pkgsubmit.pp index f5500717..ba575cd2 100644 --- a/modules/buildsystem/manifests/pkgsubmit.pp +++ b/modules/buildsystem/manifests/pkgsubmit.pp @@ -7,7 +7,7 @@ class buildsystem::pkgsubmit { ensure => directory, } - apache::vhost_base { "pkgsubmit.$::domain": + apache::vhost::base { "pkgsubmit.$::domain": aliases => { '/uploads' => "$sched_home_dir/uploads" }, location => $location, content => template('buildsystem/vhost_pkgsubmit.conf'), |