[puppet] The Puppet repository history has been rewritten, no point in keeping cgit redirects around.

[Andrea Veri <averi src gnome org>]

commit 4cfe326dc3ffb1bd16e769021e7964ef5de680dc
Author: Andrea Veri <averi redhat com>
Date:   Wed Apr 3 14:28:45 2019 +0200

    The Puppet repository history has been rewritten, no point in keeping cgit redirects around.

 modules/haproxy/templates/ssl.conf | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/modules/haproxy/templates/ssl.conf b/modules/haproxy/templates/ssl.conf
index 652b0a31..d542d9c1 100644
--- a/modules/haproxy/templates/ssl.conf
+++ b/modules/haproxy/templates/ssl.conf
@@ -254,7 +254,6 @@ SetEnvIf User-Agent ".*MSIE.*" \
 
 <VirtualHost *:443>
     ServerName git.gnome.org
-    ServerAlias infrastructure.gnome.org
 
     CustomLog  "|/usr/bin/logger -p local4.info -t apache"  combined env=!dontlog
     ErrorLog   syslog:local5
@@ -409,6 +408,26 @@ SetEnvIf User-Agent ".*MSIE.*" \
     </LocationMatch>
 </VirtualHost>
 
+<VirtualHost *:443>
+    ServerName infrastructure.gnome.org
+
+    SSLEngine on
+    SSLCertificateFile /etc/pki/tls/certs/gnome.org.crt
+    SSLCertificateKeyFile /etc/pki/tls/private/gnome.org.key
+    SSLCertificateChainFile /etc/httpd/pki/letsencrypt.intermediate.ca.pem
+
+    SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+
+    RewriteEngine On
+    RewriteCond %{HTTPS} on
+    RewriteCond %{REQUEST_URI} !/.well-known/acme-challenge
+    RewriteRule ^(.*)$ https://gitlab.gnome.org/Infrastructure/puppet [R=302,L]
+
+    <LocationMatch "^/.well-known/acme-challenge">
+      RedirectMatch ^(.*) https://letsencrypt.gnome.org$1
+    </LocationMatch>
+</VirtualHost>
+
 <VirtualHost *:443>
     ServerName lists.gnome.gr