monarch-pass/mediawiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more fixes for short-url. Put the wiki under /w and redirect / to /wiki/

Browse Source
This commit is contained in:
Adrian Malacoda 2014-11-29 03:44:28 -06:00
parent 44523806c8
commit 02900b51aa
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
000-default.conf
View File

@ -9,7 +9,7 @@
#ServerName www.example.com #ServerName www.example.com
ServerAdmin webmaster@localhost ServerAdmin webmaster@localhost
DocumentRoot /var/www/html DocumentRoot /var/www
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg. # error, crit, alert, emerg.
@ -28,7 +28,9 @@
#Include conf-available/serve-cgi-bin.conf #Include conf-available/serve-cgi-bin.conf
# MediaWiki Short URL # MediaWiki Short URL
Alias /wiki /var/www/html/index.php RedirectMatch ^/$ /wiki/
RedirectMatch ^/wiki$ /wiki/
Alias /wiki/ /var/www/w/index.php
</VirtualHost> </VirtualHost>
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet # vim: syntax=apache ts=4 sw=4 sts=4 sr noet

2
Dockerfile
View File

@ -9,7 +9,7 @@ WORKDIR /
# Remove the old hello world app and grab Mediawiki source # Remove the old hello world app and grab Mediawiki source
RUN apt-get update && apt-get install -yq git && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -yq git && rm -rf /var/lib/apt/lists/*
RUN rm -fr /app && git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git /app RUN rm -fr /app && mv /var/www/html /var/www/w && git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git /app
RUN cd /app && git checkout -b REL1_23 origin/REL1_23 RUN cd /app && git checkout -b REL1_23 origin/REL1_23
# Install extensions # Install extensions