release day commit: readd prerelease redirect, add cloud to atomic redirect, add latest cloud image redirects, setup alt site for websites

playbooks/groups/secondary.yml

@@ -44,7 +44,6 @@
     name: secondary.fedoraproject.org
     cert_name: "{{wildcard_cert_name}}"
     server_aliases:
-    - alt.fedoraproject.org
     - archive.fedoraproject.org
     - archives.fedoraproject.org
   tasks:

playbooks/include/proxies-fedora-web.yml

@@ -49,7 +49,6 @@
     website: codecs.fedoraproject.org
   - role: fedora-web/alt
     website: alt.fedoraproject.org
-    when: env == "staging"
 
   # Some other static content, not strictly part of "fedora-web" goes below here
   - role: fedora-docs/proxy

playbooks/include/proxies-redirects.yml

@@ -314,54 +314,68 @@
 
 # end staging
 
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-gfo
-#    website: getfedora.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://getfedora.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-labs-1
-#    website: labs.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://labs.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-spins-1
-#    website: spins.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://spins.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-arm-1
-#    website: arm.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://arm.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-labs-2
-#    website: labs.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://labs.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-spins-2
-#    website: spins.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://spins.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-arm-2
-#    website: arm.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://arm.fedoraproject.org/$1
-#    when: env != 'staging'
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-gfo
+    website: getfedora.org
+    regex: /(.*)/prerelease.*$
+    target: https://getfedora.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-1
+    website: labs.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://labs.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-1
+    website: spins.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://spins.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-1
+    website: arm.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://arm.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-2
+    website: labs.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://labs.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-2
+    website: spins.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://spins.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-2
+    website: arm.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://arm.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: cloud-to-atomic
+    website: getfedora.org
+    regex: /cloud/.*$
+    target: https://getfedora.org/atomic/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: cloud-to-atomic-download
+    website: getfedora.org
+    regex: /(.*)/cloud/download.*$
+    target: https://getfedora.org/$1/atomic/download
+    when: env != 'staging'
 
   - role: httpd/redirect
     name: store
@@ -472,6 +486,19 @@
 
   ## Cloud image redirects
 
+  # Redirects/pointers for fedora 25 BASE cloud images
+  - role: httpd/redirect
+    name: cloud-base-64bit-25
+    website: cloud.fedoraproject.org
+    path: /fedora-25.x86_64.qcow2
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.qcow2
+
+  - role: httpd/redirect
+    name: cloud-base-64bit-25-raw
+    website: cloud.fedoraproject.org
+    path: /fedora-25.x86_64.raw.xz
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz
+
   # Redirects/pointers for fedora 24 BASE cloud images
   - role: httpd/redirect
     name: cloud-base-64bit-24

playbooks/include/proxies-websites.yml

@@ -542,7 +542,6 @@
     - alt.stg.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
-    when: env == "staging"
 
   # Kinda silly that we have two entries here, one for prod and one for stg.
   # This is inherited from our puppet setup -- we can collapse them as soon as

roles/download/templates/httpd/dl.fedoraproject.org.conf

@@ -1,6 +1,6 @@
 <VirtualHost *:80>
   ServerName dl.fedoraproject.org
-  ServerAlias alt.fedoraproject.org archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org
+  ServerAlias archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org
   ServerAdmin webmaster@fedoraproject.org
   TraceEnable Off
 
@@ -10,7 +10,7 @@
 
 <VirtualHost *:443>
   ServerName dl.fedoraproject.org
-  ServerAlias alt.fedoraproject.org archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org
+  ServerAlias archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org
   ServerAdmin webmaster@fedoraproject.org
 
 

roles/rsyncd/files/rsyncd.conf.sundries

@@ -166,6 +166,14 @@ gid = root
 read only = yes
 hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0
 
+[alt.fedoraproject.org]
+comment = alt.fedoraproject.org
+path = /srv/web/alt.fedoraproject.org
+uid = root
+gid = root
+read only = yes
+hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0
+
 [fmw]
 comment = fmw
 path = /srv/web/fmw