diff options
| author | Olivier Blin <blino@mageia.org> | 2011-03-27 21:23:00 +0000 |
|---|---|---|
| committer | Olivier Blin <blino@mageia.org> | 2011-03-27 21:23:00 +0000 |
| commit | fe28d717066d88ad6ca28a637a8198f32f9591dd (patch) | |
| tree | 055b7e1a97f9c0aafec5a7302cc73af21a1e231a /modules | |
| parent | d435868f099c731cc754afe58b0eedd2a768b9b3 (diff) | |
| download | puppet-fe28d717066d88ad6ca28a637a8198f32f9591dd.tar puppet-fe28d717066d88ad6ca28a637a8198f32f9591dd.tar.gz puppet-fe28d717066d88ad6ca28a637a8198f32f9591dd.tar.bz2 puppet-fe28d717066d88ad6ca28a637a8198f32f9591dd.tar.xz puppet-fe28d717066d88ad6ca28a637a8198f32f9591dd.zip | |
use /distrib/mirror instead of /distrib/bootstrap on repository.mageia.org, it is less likely to have hdlist inconsistency
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/init.pp | 1 | ||||
| -rw-r--r-- | modules/buildsystem/templates/vhost_repository.conf | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index bcb6f53b..d930d6da 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -12,6 +12,7 @@ class buildsystem { # FIXME: maybe keyid should be defined at an other place $sign_keyid = "80420F66" $repository_root = "/distrib/bootstrap" + $mirror_root = "/distrib/mirror" $maintdb_url = 'http://www.maintdb2.mageia.org.uk/maintainers_packages/create' # FIXME: Test password. Real password should be in extdata. $maintdb_key = 'm1g234' diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf index bab52aa8..c9286faf 100644 --- a/modules/buildsystem/templates/vhost_repository.conf +++ b/modules/buildsystem/templates/vhost_repository.conf @@ -6,10 +6,10 @@ buildsystem_nodes = "2a02:2178:2:7::3/64 2a02:2178:2:7::4/64 2a02:2178:2:7::5/64 <VirtualHost *:80> ServerName repository.<%= domain %> - DocumentRoot <%= repository_root %> + DocumentRoot <%= mirror_root %> Alias /mandriva/ "/distrib/mandriva/" Alias /mageiatools/ "/distrib/mageiatools/" - <Directory <%= repository_root %>> + <Directory <%= mirror_root %>> Order deny,allow Deny from all Allow from localhost, 127.0.0.1 |