Freeze exception for adjusting fedorapeople.org and copr URLs to HTTPS

Till Maas opensource at till.name
Sat Aug 30 10:54:46 UTC 2014 

Hi,

I would like to propose the following change for a free exception since
I added it already to ansible assuming it can be applied only to staging
host where appropriate.

Regards
Till

Use https for fedorapeople URLs and copr-be.cloud.fedoraproject.org
- This avoids an redirect from HTTP and HTTPS on fedorapeople and is
  more appropriate for e.g. GPG key imports or repo access.
---
 files/jenkins/slaves/sbt.repo                                    | 2 +-
 playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml            | 2 +-
 roles/easyfix/files/gather_easyfix.py                            | 2 +-
 roles/freemedia/files/FreeMedia-close.html                       | 4 ++--
 roles/freemedia/files/FreeMedia-error-embargoed-destination.html | 4 ++--
 roles/freemedia/files/FreeMedia-error.html                       | 4 ++--
 roles/freemedia/files/FreeMedia-form.html                        | 4 ++--
 roles/freemedia/files/FreeMedia-form.html.orig                   | 4 ++--
 roles/mailman/files/hyperkitty.Fedora.repo                       | 8 ++++----
 roles/mailman/files/hyperkitty.RedHat.repo                       | 8 ++++----
 roles/mailman/tasks/main.yml                                     | 2 +-
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/files/jenkins/slaves/sbt.repo b/files/jenkins/slaves/sbt.repo
index 40cd3e8..7ff4881 100644
--- a/files/jenkins/slaves/sbt.repo
+++ b/files/jenkins/slaves/sbt.repo
@@ -1,6 +1,6 @@
 [codeblock-sbt-extras]
 name=Copr repo for sbt-extras owned by codeblock
-baseurl=http://copr-be.cloud.fedoraproject.org/results/codeblock/sbt-extras/fedora-$releasever-$basearch/
+baseurl=https://copr-be.cloud.fedoraproject.org/results/codeblock/sbt-extras/fedora-$releasever-$basearch/
 skip_if_unavailable=True
 gpgcheck=0
 enabled=1
diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
index 04bd39a..b925e9e 100644
--- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
@@ -47,7 +47,7 @@
     action: mount src=/srv/persist/mailman name=/var/lib/mailman3 fstype=auto opts=bind state=mounted
 
   - name: get the repo file
-    get_url: url=http://repos.fedorapeople.org/repos/abompard/hyperkitty/hyperkitty.repo
+    get_url: url=https://repos.fedorapeople.org/repos/abompard/hyperkitty/hyperkitty.repo
              dest=/etc/yum.repos.d/hyperkitty.repo mode=0444
 
   # open up ports (22, 80, 443, 25)
diff --git a/roles/easyfix/files/gather_easyfix.py b/roles/easyfix/files/gather_easyfix.py
index e44de5a..eb9eb2d 100755
--- a/roles/easyfix/files/gather_easyfix.py
+++ b/roles/easyfix/files/gather_easyfix.py
@@ -62,7 +62,7 @@ class MediaWiki(fedora.client.Wiki):
     """ Mediawiki class.
     Handles interaction with the Mediawiki.
     Code stollen from cnucnu:
-    http://fedorapeople.org/gitweb?p=till/public_git/cnucnu.git;a=summary
+    https://fedorapeople.org/gitweb?p=till/public_git/cnucnu.git;a=summary
     """
 
     def __init__(self, base_url='https://fedoraproject.org/w/', *args,
diff --git a/roles/freemedia/files/FreeMedia-close.html b/roles/freemedia/files/FreeMedia-close.html
index ce68d6b..3295fea 100644
--- a/roles/freemedia/files/FreeMedia-close.html
+++ b/roles/freemedia/files/FreeMedia-close.html
@@ -4,8 +4,8 @@
  <head>
    <title>Fedora Free Media Form</title>
    <style type="text/css" media="screen">
-     @import url("http://fedorapeople.org/userdefs/css/fedora.css");
-     @import url("http://fedorapeople.org/userdefs/css/style.css");
+     @import url("https://fedorapeople.org/userdefs/css/fedora.css");
+     @import url("https://fedorapeople.org/userdefs/css/style.css");
    </style>
  </head>
 
diff --git a/roles/freemedia/files/FreeMedia-error-embargoed-destination.html b/roles/freemedia/files/FreeMedia-error-embargoed-destination.html
index 2056a43..441b446 100644
--- a/roles/freemedia/files/FreeMedia-error-embargoed-destination.html
+++ b/roles/freemedia/files/FreeMedia-error-embargoed-destination.html
@@ -4,8 +4,8 @@
  <head>
   <title>Fedora Free Media Form</title>
   <style type="text/css" media="screen">
-    @import url("http://fedorapeople.org/userdefs/css/fedora.css");
-    @import url("http://fedorapeople.org/userdefs/css/style.css");
+    @import url("https://fedorapeople.org/userdefs/css/fedora.css");
+    @import url("https://fedorapeople.org/userdefs/css/style.css");
   </style>
  </head>
 
diff --git a/roles/freemedia/files/FreeMedia-error.html b/roles/freemedia/files/FreeMedia-error.html
index 91df3a7..37065fb 100644
--- a/roles/freemedia/files/FreeMedia-error.html
+++ b/roles/freemedia/files/FreeMedia-error.html
@@ -4,8 +4,8 @@
  <head>
   <title>Fedora Free Media Form</title>
   <style type="text/css" media="screen">
-    @import url("http://fedorapeople.org/userdefs/css/fedora.css");
-    @import url("http://fedorapeople.org/userdefs/css/style.css");
+    @import url("https://fedorapeople.org/userdefs/css/fedora.css");
+    @import url("https://fedorapeople.org/userdefs/css/style.css");
   </style>
  </head>
 
diff --git a/roles/freemedia/files/FreeMedia-form.html b/roles/freemedia/files/FreeMedia-form.html
index e5b8b42..9afa4ed 100644
--- a/roles/freemedia/files/FreeMedia-form.html
+++ b/roles/freemedia/files/FreeMedia-form.html
@@ -3,8 +3,8 @@
  
 <head>
 <title>Fedora Free Media Form</title>
-<link rel="stylesheet" type="text/css" href="http://fedorapeople.org/userdefs/css/fedora.css">
-<link rel="stylesheer" type="text/css" href="http://fedorapeople.org/userdefs/css/style.css">
+<link rel="stylesheet" type="text/css" href="https://fedorapeople.org/userdefs/css/fedora.css">
+<link rel="stylesheer" type="text/css" href="https://fedorapeople.org/userdefs/css/style.css">
 </head>
  
 <body>
diff --git a/roles/freemedia/files/FreeMedia-form.html.orig b/roles/freemedia/files/FreeMedia-form.html.orig
index 48132af..e8e039f 100644
--- a/roles/freemedia/files/FreeMedia-form.html.orig
+++ b/roles/freemedia/files/FreeMedia-form.html.orig
@@ -4,8 +4,8 @@
  <head>
    <title>Fedora Free Media Form</title>
    <style type="text/css" media="screen">
-     @import url("http://fedorapeople.org/userdefs/css/fedora.css");
-     @import url("http://fedorapeople.org/userdefs/css/style.css");
+     @import url("https://fedorapeople.org/userdefs/css/fedora.css");
+     @import url("https://fedorapeople.org/userdefs/css/style.css");
    </style>
  </head>
 
diff --git a/roles/mailman/files/hyperkitty.Fedora.repo b/roles/mailman/files/hyperkitty.Fedora.repo
index a6f711e..1c711d0 100644
--- a/roles/mailman/files/hyperkitty.Fedora.repo
+++ b/roles/mailman/files/hyperkitty.Fedora.repo
@@ -1,15 +1,15 @@
 [hyperkitty]
 name=HyperKitty archiver and its dependencies
-baseurl=http://repos.fedorapeople.org/repos/abompard/hyperkitty/fedora-$releasever/$basearch/
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/fedora-$releasever/$basearch/
 enabled=1
 skip_if_unavailable=1
 gpgcheck=1
-gpgkey=http://repos.fedorapeople.org/repos/abompard/abompard.asc
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
 
 [hyperkitty-source]
 name=HyperKitty archiver and its dependencies - Source
-baseurl=http://repos.fedorapeople.org/repos/abompard/hyperkitty/fedora-$releasever/SRPMS
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/fedora-$releasever/SRPMS
 enabled=0
 skip_if_unavailable=1
 gpgcheck=1
-gpgkey=http://repos.fedorapeople.org/repos/abompard/abompard.asc
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
diff --git a/roles/mailman/files/hyperkitty.RedHat.repo b/roles/mailman/files/hyperkitty.RedHat.repo
index 399a73a..01c050a 100644
--- a/roles/mailman/files/hyperkitty.RedHat.repo
+++ b/roles/mailman/files/hyperkitty.RedHat.repo
@@ -1,15 +1,15 @@
 [hyperkitty]
 name=HyperKitty archiver and its dependencies
-baseurl=http://repos.fedorapeople.org/repos/abompard/hyperkitty/el-$releasever/$basearch/
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/el-$releasever/$basearch/
 enabled=1
 skip_if_unavailable=1
 gpgcheck=1
-gpgkey=http://repos.fedorapeople.org/repos/abompard/abompard.asc
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
 
 [hyperkitty-source]
 name=HyperKitty archiver and its dependencies - Source
-baseurl=http://repos.fedorapeople.org/repos/abompard/hyperkitty/el-$releasever/SRPMS
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/el-$releasever/SRPMS
 enabled=0
 skip_if_unavailable=1
 gpgcheck=1
-gpgkey=http://repos.fedorapeople.org/repos/abompard/abompard.asc
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index d12dd35..dc88ca5 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -42,7 +42,7 @@
   yum: state=installed name=gnupg
 
 - name: add the GPG key
-  rpm_key: state=present key=http://repos.fedorapeople.org/repos/abompard/abompard.asc
+  rpm_key: state=present key=https://repos.fedorapeople.org/repos/abompard/abompard.asc
 
 - name: install needed packages
   yum: pkg={{ item }} state=installed
-- 
1.8.3.1

More information about the infrastructure mailing list