From c5701c01c4a08e9d7945c1fdf20e3856d9dbdccf Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Mar 03 2020 16:36:04 +0000
Subject: remove out-dated fedoramagazine and fedoracommunity lines


---

diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml
index 4d494fe..c6704a5 100644
--- a/playbooks/include/proxies-certificates.yml
+++ b/playbooks/include/proxies-certificates.yml
@@ -19,10 +19,6 @@
     certname: wildcard-2020.fedoraproject.org
     SSLCertificateChainFile: wildcard-2020.fedoraproject.org.intermediate.cert
 
-  # - role: httpd/certificate
-  #   certname: wildcard-2017.fedorahosted.org
-  #   SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
-
   - role: httpd/certificate
     certname: wildcard-2017.id.fedoraproject.org
     SSLCertificateChainFile: wildcard-2017.id.fedoraproject.org.intermediate.cert
@@ -45,10 +41,6 @@
     tags:
     - app.os.fedoraproject.org
 
-  # - role: httpd/certificate
-  #   certname: fedoramagazine.org
-  #   SSLCertificateChainFile: fedoramagazine.org.intermediate.cert
-
   - role: httpd/certificate
     certname: getfedora.org
     SSLCertificateChainFile: getfedora.org.intermediate.cert
@@ -66,8 +58,3 @@
   #   certname: secondary.koji.fedoraproject.org.letsencrypt
   #   SSLCertificateChainFile: secondary.koji.fedoraproject.org.letsencrypt.intermediate.crt
 
-  # - role: httpd/certificate
-  #   certname: fedoracommunity.org
-  #   SSLCertificateChainFile: fedoracommunity.org.intermediate.cert
-  #   tags:
-  #   - fedoracommunity.org
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 9c8beb2..4976048 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -407,8 +407,6 @@
     # - www.fedoraproject.community
     ssl: true
     certbot: true
-    # cert_name: fedoracommunity.org
-    # SSLCertificateChainFile: fedoracommunity.org.intermediate.cert
     tags: fedoracommunity
 
   - role: httpd/website
@@ -516,13 +514,6 @@
     - whatcanidoforfedora.org
 
   - role: httpd/website
-    site_name: fedoramagazine.org
-    server_aliases: [www.fedoramagazine.org stg.fedoramagazine.org]
-    cert_name: fedoramagazine.org
-    SSLCertificateChainFile: fedoramagazine.org.intermediate.cert
-    sslonly: true
-
-  - role: httpd/website
     site_name: k12linux.org
     server_aliases:
     - www.k12linux.org