aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mga-mirrors
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-05-19 10:14:28 +0000
committerNicolas Vigier <boklm@mageia.org>2011-05-19 10:14:28 +0000
commitc2b502c38aab206f12e667400f3b99232509d13f (patch)
tree4dd41ec349b748acb4c081d7a4f7288f8a5623c8 /modules/mga-mirrors
parent974d36d7e15b5f2c528d0325f85ac63380aa8a6b (diff)
downloadpuppet-c2b502c38aab206f12e667400f3b99232509d13f.tar
puppet-c2b502c38aab206f12e667400f3b99232509d13f.tar.gz
puppet-c2b502c38aab206f12e667400f3b99232509d13f.tar.bz2
puppet-c2b502c38aab206f12e667400f3b99232509d13f.tar.xz
puppet-c2b502c38aab206f12e667400f3b99232509d13f.zip
redirect http to https on mirrors.mageia.org
Diffstat (limited to 'modules/mga-mirrors')
-rw-r--r--modules/mga-mirrors/manifests/init.pp8
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp
index 354df033..714cf463 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga-mirrors/manifests/init.pp
@@ -9,15 +9,11 @@ class mga-mirrors {
apache::vhost_catalyst_app { $vhost:
script => "/usr/bin/mga_mirrors_fastcgi.pl",
require => Package['mga-mirrors']
- }
-
- apache::vhost_catalyst_app { "ssl_$vhost":
- vhost => $vhost,
use_ssl => true,
- script => "/usr/bin/mga_mirrors_fastcgi.pl",
- require => Package['mga-mirrors']
}
+ apache::vhost_redirect_ssl { $vhost: }
+
$pgsql_password = extlookup("mga_mirror_pgsql",'x')
postgresql::remote_db_and_user { 'mirrors':