aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2018-09-04 22:52:09 +0259
committerThomas Backlund <tmb@mageia.org>2018-09-04 22:52:09 +0259
commit365d70d8ecc93b528a6085a2a37568bb6291109d (patch)
tree12399b0308570efd91258fe8f7b66a05cbf99715 /deployment
parentccae161f5328c16afd5cd21477d705ef14b5aebd (diff)
downloadpuppet-365d70d8ecc93b528a6085a2a37568bb6291109d.tar
puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.tar.gz
puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.tar.bz2
puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.tar.xz
puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.zip
deployment: switch to https://
Diffstat (limited to 'deployment')
-rw-r--r--deployment/main_mirror/files/mirror/mirror.readme6
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp2
-rwxr-xr-xdeployment/mgagit/templates/git-post-receive-hook4
-rw-r--r--deployment/repositories/manifests/subversion.pp4
-rw-r--r--deployment/tld_redirections/manifests/init.pp4
-rw-r--r--deployment/websites/manifests/git.pp2
-rw-r--r--deployment/websites/manifests/start.pp2
-rw-r--r--deployment/websites/manifests/svn.pp2
-rw-r--r--deployment/websites/manifests/www.pp2
-rw-r--r--deployment/websites/templates/vhost_www.conf2
-rw-r--r--deployment/websites/templates/vhost_www_rewrite.conf20
11 files changed, 25 insertions, 25 deletions
diff --git a/deployment/main_mirror/files/mirror/mirror.readme b/deployment/main_mirror/files/mirror/mirror.readme
index 48234964..a05fa807 100644
--- a/deployment/main_mirror/files/mirror/mirror.readme
+++ b/deployment/main_mirror/files/mirror/mirror.readme
@@ -26,8 +26,8 @@ For a public mirror, we encourage you to use one of our Tier1 mirrors.
The servers below synchronise the tree directly from the Mageia rsync server.
- Check http://mirrors.mageia.org/ for their bandwidths.
- Check http://mirrors.mageia.org/status for their current statuses.
+ Check https://mirrors.mageia.org/ for their bandwidths.
+ Check https://mirrors.mageia.org/status for their current statuses.
o rsync://mageia.c3sl.ufpr.br/mageia/
located in Curitiba (Brasil)
@@ -66,7 +66,7 @@ one is still running. Use a lock file.
5) Registering your mirror
--------------------------
-Go to http://mirrors.mageia.org/new and enter all possible protocols.
+Go to https://mirrors.mageia.org/new and enter all possible protocols.
6) Subscribe to the mirrors-announce mailing list
-------------------------------------------------
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index d92dc334..ef65e827 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -11,7 +11,7 @@ class mga_buildsystem::config {
}
class { 'buildsystem::var::webstatus' :
- package_commit_url => "http://svnweb.${::domain}/packages?view=revision&revision=%d",
+ package_commit_url => "https://svnweb.${::domain}/packages?view=revision&revision=%d",
theme_name => 'mageia',
}
diff --git a/deployment/mgagit/templates/git-post-receive-hook b/deployment/mgagit/templates/git-post-receive-hook
index 06ffbb9e..624ba39e 100755
--- a/deployment/mgagit/templates/git-post-receive-hook
+++ b/deployment/mgagit/templates/git-post-receive-hook
@@ -26,7 +26,7 @@ BUG_REFS = {
}
COMMIT_RE = re.compile('^commit ([a-f0-9]{40})')
-COMMIT_REPLACE = 'http://gitweb.mageia.org/%s/commit/?id=%s'
+COMMIT_REPLACE = 'https://gitweb.mageia.org/%s/commit/?id=%s'
MAGEIA_BUGZILLA_URL = 'https://bugs.mageia.org/xmlrpc.cgi'
MAGEIA_BUGZILLA_PASSWORD_FILE = '.gitzilla-password'
@@ -257,7 +257,7 @@ if __name__ == '__main__':
pass
try:
- req = urllib2.Request('http://gitweb.mageia.org:8000', repo_shortname() + '.git')
+ req = urllib2.Request('https://gitweb.mageia.org:8000', repo_shortname() + '.git')
req.add_header('Content-Type', 'x-git/repo')
fp = urllib2.urlopen(req, timeout=5)
if (fp):
diff --git a/deployment/repositories/manifests/subversion.pp b/deployment/repositories/manifests/subversion.pp
index 1f17ab5a..f8b759fc 100644
--- a/deployment/repositories/manifests/subversion.pp
+++ b/deployment/repositories/manifests/subversion.pp
@@ -55,8 +55,8 @@ class repositories::subversion {
irker_conf => {
project => 'mageia',
repo => 'testrepo',
- tinyifier => 'http://is.gd/create.php?format=simple&url=',
- urlprefix => "http://svnweb.${::domain}/%(repo)?view=revision&revision=",
+ tinyifier => 'https://is.gd/create.php?format=simple&url=',
+ urlprefix => "https://svnweb.${::domain}/%(repo)?view=revision&revision=",
channels => '{irc://chat.freenode.net/commits, irc://chat.freenode.net/test-irker}',
},
}
diff --git a/deployment/tld_redirections/manifests/init.pp b/deployment/tld_redirections/manifests/init.pp
index 9e63b707..9815367c 100644
--- a/deployment/tld_redirections/manifests/init.pp
+++ b/deployment/tld_redirections/manifests/init.pp
@@ -10,11 +10,11 @@ class tld_redirections {
}
apache::vhost_redirect { "mageia.${name}":
- url => "http://www.${::domain}/?fromtld=${name}"
+ url => "https://www.${::domain}/?fromtld=${name}"
}
apache::vhost_redirect { "www.mageia.${name}":
- url => "http://www.${::domain}/?fromtld=${name}"
+ url => "https://www.${::domain}/?fromtld=${name}"
}
}
diff --git a/deployment/websites/manifests/git.pp b/deployment/websites/manifests/git.pp
index 8e7a0058..a71de33f 100644
--- a/deployment/websites/manifests/git.pp
+++ b/deployment/websites/manifests/git.pp
@@ -1,5 +1,5 @@
class websites::git {
apache::vhost_redirect { "git.${::domain}":
- url => "http://gitweb.${::domain}/",
+ url => "https://gitweb.${::domain}/",
}
}
diff --git a/deployment/websites/manifests/start.pp b/deployment/websites/manifests/start.pp
index ed0d4adb..0db6dec1 100644
--- a/deployment/websites/manifests/start.pp
+++ b/deployment/websites/manifests/start.pp
@@ -1,6 +1,6 @@
class websites::start {
include websites::base
apache::vhost_redirect { "start.${::domain}":
- url => "http://www.${::domain}/community/",
+ url => "https://www.${::domain}/community/",
}
}
diff --git a/deployment/websites/manifests/svn.pp b/deployment/websites/manifests/svn.pp
index d8e87f64..ad49f69e 100644
--- a/deployment/websites/manifests/svn.pp
+++ b/deployment/websites/manifests/svn.pp
@@ -1,5 +1,5 @@
class websites::svn {
apache::vhost_redirect { "svn.${::domain}":
- url => "http://svnweb.${::domain}/",
+ url => "https://svnweb.${::domain}/",
}
}
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index ecff73e6..c0c556ea 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -51,7 +51,7 @@ class websites::www {
}
apache::vhost_redirect { "${::domain}":
- url => "http://www.${::domain}/",
+ url => "https://www.${::domain}/",
}
apache::vhost_redirect { "ssl_${::domain}":
diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf
index a28e7309..1d60db0b 100644
--- a/deployment/websites/templates/vhost_www.conf
+++ b/deployment/websites/templates/vhost_www.conf
@@ -2,7 +2,7 @@ Redirect /wiki https://wiki.mageia.org/#
# Everything under /g/ is static content to be served by a seconday host
RewriteEngine On
-RewriteRule ^g/(.+)$ http://static.mageia.org/g/$1 [R,L,QSA]
+RewriteRule ^g/(.+)$ https://static.mageia.org/g/$1 [R,L,QSA]
ErrorDocument 404 /404.php
diff --git a/deployment/websites/templates/vhost_www_rewrite.conf b/deployment/websites/templates/vhost_www_rewrite.conf
index f1fa607e..c7bb2fd5 100644
--- a/deployment/websites/templates/vhost_www_rewrite.conf
+++ b/deployment/websites/templates/vhost_www_rewrite.conf
@@ -10,13 +10,13 @@ RewriteRule ^/mailman/listinfo/mageia-sysadm https://ml.mageia.org/l/info/sysadm
RewriteRule ^/mailman/listinfo/mageia-webteam https://ml.mageia.org/l/info/atelier-discuss [R=301,L]
RewriteRule ^/mailman https://ml.mageia.org/ [R=301,L]
-RewriteRule ^/pipermail/mageia-announce/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-announce/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-artwork/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-artwork/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-bugsquad/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-bugsquad/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-dev/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-dev/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-discuss/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-discuss/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-i18n/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-i18n/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-marketing/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-marketing/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-sysadm/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-sysadm/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-webteam/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-webteam/$1 [R=301,L]
-RewriteRule ^/pipermail http://archives.mageia.org/zarb-ml/ [R=301,L]
+RewriteRule ^/pipermail/mageia-announce/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-announce/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-artwork/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-artwork/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-bugsquad/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-bugsquad/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-dev/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-dev/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-discuss/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-discuss/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-i18n/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-i18n/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-marketing/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-marketing/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-sysadm/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-sysadm/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-webteam/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-webteam/$1 [R=301,L]
+RewriteRule ^/pipermail https://archives.mageia.org/zarb-ml/ [R=301,L]