ansible/hg-web: add `ci` directory to hgmo vhost config (Bug 1523461) r=fubar
authorConnor Sheehan <sheehan@mozilla.com>
Tue, 29 Jan 2019 18:38:54 +0000
changeset 6828 3b362b7a9144174faa658e7a23dbff1765603a34
parent 6827 e20add4aea9f1ed25a4a8792b8b618a6f56a0fd8
child 6829 b6fdb20fa60952779503cb55fd576867738cb785
push id3393
push usercosheehan@mozilla.com
push dateTue, 29 Jan 2019 18:43:05 +0000
treeherderversion-control-tools@3b362b7a9144 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfubar
bugs1523461
ansible/hg-web: add `ci` directory to hgmo vhost config (Bug 1523461) r=fubar We set up the hgwsgi files, but never taught httpd how to serve them correctly. This commit adds them to the vhost config to hgmo knows to load the correct wsgi files for those paths. Differential Revision: https://phabricator.services.mozilla.com/D17961
ansible/roles/hg-web/templates/vhost.conf.j2
--- a/ansible/roles/hg-web/templates/vhost.conf.j2
+++ b/ansible/roles/hg-web/templates/vhost.conf.j2
@@ -49,17 +49,17 @@ LimitRequestFields 1000
     WSGIScriptAliasMatch ^/(users/[^/]+)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
     WSGIScriptAliasMatch ^/(releases/l10n-mozilla-1.9..)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
     WSGIScriptAliasMatch ^/(releases/l10n-mozilla-2.0)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
     WSGIScriptAliasMatch ^/(releases/l10n-miramar)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
     WSGIScriptAliasMatch ^/(releases/gaia-l10n/[^/]+)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
     WSGIScriptAliasMatch ^/(releases/l10n/mozilla-aurora)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
     WSGIScriptAliasMatch ^/(releases/l10n/mozilla-beta)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
     WSGIScriptAliasMatch ^/(releases/l10n/mozilla-release)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
-    WSGIScriptAliasMatch ^/(experimental|incubator|testpilot-l10n|weave-l10n|gaia-l10n|build|labs|services|l10n(?!-)|l10n-central|projects|automation|qa|hgcustom|webtools|releases|rewriting-and-analysis|www|SeaMonkey)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
+    WSGIScriptAliasMatch ^/(experimental|incubator|testpilot-l10n|weave-l10n|gaia-l10n|build|labs|services|l10n(?!-)|l10n-central|projects|automation|qa|hgcustom|webtools|releases|rewriting-and-analysis|www|SeaMonkey|ci)(.*) /repo_local/mozilla/webroot_wsgi/$1/hgweb.wsgi$2
     WSGIScriptAliasMatch ^/dist(.*) /repo_local/mozilla/webroot_wsgi/dist/hgweb.wsgi$1
     WSGIScriptAliasMatch ^/integration(.*) /repo_local/mozilla/webroot_wsgi/integration/hgweb.wsgi$1
     WSGIScriptAliasMatch ^/mozreview(.*) /repo_local/mozilla/webroot_wsgi/mozreview/hgweb.wsgi$1
     WSGIScriptAliasMatch ^(/(?!users|robots).*) /repo_local/mozilla/webroot_wsgi/hgweb.wsgi$1
 
     <Location /users>
         Options +Indexes
         Require all granted