Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115388
Change subject: contint: tweak browsertests URLs
......................................................................
contint: tweak browsertests URLs
We need browsertests to mimic MediaWiki paths in production. Ie
something like:
http://localhost:9413/CirrusSearch/wiki/Main_Page
http://localhost:9413/CirrusSearch/w/api.php
Made possible by having the job create a symlink of w -> .
Jenkins jobs change is: https://gerrit.wikimedia.org/r/115387
Change-Id: I0855e60fb53f68b98beec55e445298a2af22f0fa
---
M modules/contint/manifests/browsertests.pp
M modules/contint/templates/apache/localvhost.erb
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/115388/1
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index a22d250..0c78f99 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -30,6 +30,8 @@
]: ensure => present
}
+ apache_module { 'browser_test_apache_mod_rewrite': name => 'rewrite' }
+
# And we need a vhost :-)
contint::localvhost { 'browsertests':
port => 9413,
diff --git a/modules/contint/templates/apache/localvhost.erb
b/modules/contint/templates/apache/localvhost.erb
index bc9510b..53efa1d 100644
--- a/modules/contint/templates/apache/localvhost.erb
+++ b/modules/contint/templates/apache/localvhost.erb
@@ -7,6 +7,15 @@
ServerName localhost
DocumentRoot <%= @docroot %>
+ # Lame examples::
+ # http://localhost:9413/CirrusSearch/
+ # http://localhost:9413/CirrusSearch/Main_Page
+ # http://localhost:9413/CirrusSearch/api.php
+ RewriteEngine on
+ RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
+ RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
+ RewriteRule ^/([\w-]+)/(.*)?$ /$1/index.php [L]
+
<Directory />
Order deny,allow
Deny from all
--
To view, visit https://gerrit.wikimedia.org/r/115388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0855e60fb53f68b98beec55e445298a2af22f0fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
