[wiki-web] Use pango.gnome.org as the base domain

[Andrea Veri <averi src gnome org>]

commit 0a8b1c00e75fe8913e72e948d7ff4af9a4ad33d2
Author: Andrea Veri <averi redhat com>
Date:   Tue Aug 6 22:32:37 2019 +0200

    Use pango.gnome.org as the base domain

 app_data/httpd-cfg/01_www.pango.org.conf | 18 ++++--------------
 app_data/httpd-pre-init/initialize.sh    |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/app_data/httpd-cfg/01_www.pango.org.conf b/app_data/httpd-cfg/01_www.pango.org.conf
index a5cacf9..b256fce 100644
--- a/app_data/httpd-cfg/01_www.pango.org.conf
+++ b/app_data/httpd-cfg/01_www.pango.org.conf
@@ -1,17 +1,7 @@
 <VirtualHost *:8443>
-  ServerName pango.org
-  ServerAlias wiki.pango.org
-  ServerAlias www.pango.org
-  ServerAlias pango.gnome.org
+  ServerName pango.gnome.org 
 
-  RewriteCond %{HTTPS} !=on
-  RewriteRule .* https://www.pango.org%{REQUEST_URI} [NE,R,L]
-</VirtualHost>
-
-<VirtualHost *:8443>
-  ServerName www.pango.org
-
-  DocumentRoot /srv/http/data/www.pango.org/root 
+  DocumentRoot /srv/http/data/pango.gnome.org/root 
   DirectoryIndex index.html
 
   SSLEngine on
@@ -28,13 +18,13 @@
   # Standard moinmoin/mod_python integration rules
   RewriteRule ^/moin_static1910/(.*)$ /srv/http/moin/wiki/htdocs/$1 [last]
   RewriteRule ^/robots.txt$ /srv/http/moin/wiki/htdocs/robots.txt [last]
-  RewriteRule ^/favicon.ico$ /srv/http/data/www.pango.org/root/favicon.ico [last]
+  RewriteRule ^/favicon.ico$ /srv/http/data/pango.gnome.org/root/favicon.ico [last]
 
   WSGIDaemonProcess moin_pango user=apache group=apache processes=8 threads=10 maximum-requests=300 
umask=0007
   WSGIProcessGroup moin_pango
 
   # mod_wsgi
-  WSGIScriptAlias /   /srv/http/wsgi/www.pango.org.wsgi
+  WSGIScriptAlias /   /srv/http/wsgi/pango.gnome.org.wsgi
 
   <Location />
     <Limit POST>
diff --git a/app_data/httpd-pre-init/initialize.sh b/app_data/httpd-pre-init/initialize.sh
index 7e230f1..03c04e2 100755
--- a/app_data/httpd-pre-init/initialize.sh
+++ b/app_data/httpd-pre-init/initialize.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cp /tmp/moinmoin-configmap/wiki.gnome.org.wsgi /srv/http/wsgi/wiki.gnome.org.wsgi
-cp /tmp/moinmoin-configmap/www.pango.org.wsgi /srv/http/wsgi/www.pango.org.wsgi
+cp /tmp/moinmoin-configmap/pango.gnome.org.wsgi /srv/http/wsgi/pango.gnome.org.wsgi