aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Fandrich <danf@mageia.org>2024-03-01 17:03:55 -0800
committerDan Fandrich <danf@mageia.org>2024-03-01 17:03:55 -0800
commitdb905c74b31c76477b097b1a6185206526228ee5 (patch)
tree13ca7d8bf47b8aa814da6343abcb6dd8fe83a049
parent85dd260a85daddbf223290a4570abf93e36478f1 (diff)
downloadpuppet-db905c74b31c76477b097b1a6185206526228ee5.tar
puppet-db905c74b31c76477b097b1a6185206526228ee5.tar.gz
puppet-db905c74b31c76477b097b1a6185206526228ee5.tar.bz2
puppet-db905c74b31c76477b097b1a6185206526228ee5.tar.xz
puppet-db905c74b31c76477b097b1a6185206526228ee5.zip
Enable https: versions of all http: redirects (mga#32903)
Also, reinstate the http://start.mageia.org/ redirect that was accidentally deleted in the previous commit.
-rw-r--r--deployment/websites/manifests/git.pp4
-rw-r--r--deployment/websites/manifests/start.pp3
-rw-r--r--deployment/websites/manifests/svn.pp4
3 files changed, 11 insertions, 0 deletions
diff --git a/deployment/websites/manifests/git.pp b/deployment/websites/manifests/git.pp
index a71de33f..90944016 100644
--- a/deployment/websites/manifests/git.pp
+++ b/deployment/websites/manifests/git.pp
@@ -2,4 +2,8 @@ class websites::git {
apache::vhost_redirect { "git.${::domain}":
url => "https://gitweb.${::domain}/",
}
+ apache::vhost_redirect { "ssl_git.${::domain}":
+ use_ssl => true,
+ url => "https://gitweb.${::domain}/",
+ }
}
diff --git a/deployment/websites/manifests/start.pp b/deployment/websites/manifests/start.pp
index f18adad4..4674591c 100644
--- a/deployment/websites/manifests/start.pp
+++ b/deployment/websites/manifests/start.pp
@@ -1,6 +1,9 @@
class websites::start {
include websites::base
apache::vhost_redirect { "start.${::domain}":
+ url => "https://www.${::domain}/community/",
+ }
+ apache::vhost_redirect { "ssl_start.${::domain}":
use_ssl => true,
url => "https://www.${::domain}/community/",
}
diff --git a/deployment/websites/manifests/svn.pp b/deployment/websites/manifests/svn.pp
index ad49f69e..a1a39d01 100644
--- a/deployment/websites/manifests/svn.pp
+++ b/deployment/websites/manifests/svn.pp
@@ -2,4 +2,8 @@ class websites::svn {
apache::vhost_redirect { "svn.${::domain}":
url => "https://svnweb.${::domain}/",
}
+ apache::vhost_redirect { "ssl_svn.${::domain}":
+ use_ssl => true,
+ url => "https://svnweb.${::domain}/",
+ }
}