[puppet] Make sure infrastructure.g.o rewrites persist

[Andrea Veri <averi src gnome org>]

commit 3d63c38f02816d784fe3e5d181f178b90c2a4a47
Author: Andrea Veri <averi redhat com>
Date:   Wed Apr 3 13:22:20 2019 +0200

    Make sure infrastructure.g.o rewrites persist

 modules/haproxy/templates/ssl.conf                | 1 +
 modules/httpd/files/sites.d/gitlab.gnome.org.conf | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/modules/haproxy/templates/ssl.conf b/modules/haproxy/templates/ssl.conf
index a079e7a3..652b0a31 100644
--- a/modules/haproxy/templates/ssl.conf
+++ b/modules/haproxy/templates/ssl.conf
@@ -254,6 +254,7 @@ 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
diff --git a/modules/httpd/files/sites.d/gitlab.gnome.org.conf 
b/modules/httpd/files/sites.d/gitlab.gnome.org.conf
index 20c1d50b..2a993ac6 100644
--- a/modules/httpd/files/sites.d/gitlab.gnome.org.conf
+++ b/modules/httpd/files/sites.d/gitlab.gnome.org.conf
@@ -48,8 +48,8 @@
 
   # Rewrite GNOME to GNOMEInfrastructure here to avoid landing several additional
   # rules on the git.g.o's vhost
-  RewriteCond %{REQUEST_URI} 
^/GNOME/(foundation-web|pygtk-web|library-web|static-web|gtk-web|extensions-web|glade-web|odrs-web|gnome-web-www|mail-web|opw-web|api-web|previous-guadec-websites|happybirthdaygnome-web|ipsilon-web|gimp-web-devel|gnomefr-web|mhonarc|sysadmin-bin|bugzilla-gnome-org-upstream|bugzilla-gnome-org-customizations|shell-perf-web|gimp-web|gnomegr-web|guadec-web)
-  RewriteRule 
/GNOME/(foundation-web|pygtk-web|library-web|static-web|gtk-web|extensions-web|glade-web|odrs-web|gnome-web-www|mail-web|opw-web|api-web|previous-guadec-websites|happybirthdaygnome-web|ipsilon-web|gimp-web-devel|gnomefr-web|mhonarc|sysadmin-bin|bugzilla-gnome-org-upstream|bugzilla-gnome-org-customizations|shell-perf-web|gimp-web|gnomegr-web|guadec-web)(.*)
 https://gitlab.gnome.org/Infrastructure/$1$2 [R=301,L]
+  RewriteCond %{REQUEST_URI} 
^/GNOME/(foundation-web|pygtk-web|library-web|static-web|gtk-web|extensions-web|glade-web|odrs-web|gnome-web-www|mail-web|opw-web|api-web|previous-guadec-websites|happybirthdaygnome-web|ipsilon-web|gimp-web-devel|gnomefr-web|mhonarc|sysadmin-bin|bugzilla-gnome-org-upstream|bugzilla-gnome-org-customizations|shell-perf-web|gimp-web|gnomegr-web|guadec-web|puppet)
+  RewriteRule 
/GNOME/(foundation-web|pygtk-web|library-web|static-web|gtk-web|extensions-web|glade-web|odrs-web|gnome-web-www|mail-web|opw-web|api-web|previous-guadec-websites|happybirthdaygnome-web|ipsilon-web|gimp-web-devel|gnomefr-web|mhonarc|sysadmin-bin|bugzilla-gnome-org-upstream|bugzilla-gnome-org-customizations|shell-perf-web|gimp-web|gnomegr-web|guadec-web|puppet)(.*)
 https://gitlab.gnome.org/Infrastructure/$1$2 [R=301,L]
 
   # Projects that were renamed
   RewriteCond %{REQUEST_URI} ^/GNOME/gnome-themes-standard