From c811a28e038e1cffec0fa14fc825c9b5a50c6f23 Mon Sep 17 00:00:00 2001 From: Kris Lamoureux Date: Thu, 30 Jan 2020 22:32:40 -0500 Subject: [PATCH] Added Local Settings and Short URLs Install in /w for Short URLs, add LocalSettings.php template and added rewrite rules --- roles/mediawiki/tasks/main.yml | 13 +- .../mediawiki/templates/LocalSettings.php.j2 | 186 ++++++++++++++++++ roles/mediawiki/templates/mediawiki.conf.j2 | 12 ++ 3 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 roles/mediawiki/templates/LocalSettings.php.j2 diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index df93ad6..131cd59 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -22,6 +22,12 @@ path: "{{ mw_dir }}/public_html" state: directory +# https://www.mediawiki.org/wiki/Manual:Short_URL#Moving_a_wiki_from_/wiki_to_/w +- name: Create Directory /w for Short URLs + file: + path: "{{ mw_dir }}/public_html/w" + state: directory + - name: Create Logs Directory file: path: "{{ mw_dir }}/logs" @@ -37,12 +43,17 @@ - name: Extract MediaWiki unarchive: src: /tmp/mediawiki-{{ mw_version }}.tar.gz - dest: "{{ mw_dir }}/public_html" + dest: "{{ mw_dir }}/public_html/w" owner: www-data group: www-data extra_opts: [--strip-components=1] remote_src: yes +- name: Apply LocalSettings.php + template: + src: LocalSettings.php.j2 + dest: "{{ mw_dir }}/public_html/w/LocalSettings.php" + - name: Apply Apache Configuration template: src: mediawiki.conf.j2 diff --git a/roles/mediawiki/templates/LocalSettings.php.j2 b/roles/mediawiki/templates/LocalSettings.php.j2 new file mode 100644 index 0000000..14c9f6d --- /dev/null +++ b/roles/mediawiki/templates/LocalSettings.php.j2 @@ -0,0 +1,186 @@ + 'http://localhost:8142', +]; + +$wgShowExceptionDetails = true; diff --git a/roles/mediawiki/templates/mediawiki.conf.j2 b/roles/mediawiki/templates/mediawiki.conf.j2 index 8189fb1..f8df510 100644 --- a/roles/mediawiki/templates/mediawiki.conf.j2 +++ b/roles/mediawiki/templates/mediawiki.conf.j2 @@ -4,6 +4,18 @@ ServerAdmin {{ mw_admin_email }} DocumentRoot {{ mw_dir }}/public_html + RewriteEngine On + RewriteRule ^/?wiki(/.*)?$ %{DOCUMENT_ROOT}/w/index.php [L] + RewriteRule ^/?$ %{DOCUMENT_ROOT}/w/index.php [L] + + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + RewriteRule ^/?w/images/thumb/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ %{DOCUMENT_ROOT}/w/thumb.php?f=$1&width=$2 [L,QSA,B] + + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + RewriteRule ^/?w/images/thumb/archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ %{DOCUMENT_ROOT}/w/thumb.php?f=$1&width=$2&archived=1 [L,QSA,B] + ErrorLog {{ mw_dir }}/logs/error.log CustomLog {{ mw_dir }}/logs/access.log combined