From 49082d811bd4acafd1f1a88241b90f9f15aaeed7 Mon Sep 17 00:00:00 2001 From: tim-moody Date: Wed, 21 Mar 2018 12:05:51 -0400 Subject: [PATCH] there yet? --- roles/mediawiki/defaults/main.yml | 2 +- roles/mediawiki/tasks/install.yml | 12 ++++++------ roles/mediawiki/templates/LocalSettings.php.j2 | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/mediawiki/defaults/main.yml b/roles/mediawiki/defaults/main.yml index cb1420648..708549e45 100644 --- a/roles/mediawiki/defaults/main.yml +++ b/roles/mediawiki/defaults/main.yml @@ -18,7 +18,7 @@ mediawiki_install: True mediawiki_enabled: True mediawiki_install_path: "{{ content_base }}" -mediawiki_abs_path: "{{ mediawiki_install_path }}/{{ mediawiki_src }}" +mediawiki_abs_path: "{{ mediawiki_install_path }}/mediawiki-{{ mediawiki_version }}" mediawiki_url: /mediawiki mediawiki_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}/{{ mediawiki_url }}" diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index f61b64dff..46a00ad7c 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -2,8 +2,8 @@ package: name={{ item }} state=present with_items: - - {{ php_version }}-intl - - {{ php_version }}-mbstring + - "php{{ php_version }}-intl" + - "php{{ php_version }}-mbstring" tags: - download @@ -58,9 +58,9 @@ --pass={{ mediawiki_admin_user_password }} "{{ mediawiki_site_name }}" "{{ mediawiki_admin_user }}" - args: - chdir: "{{ mediawiki_abs_path }}" - creates: "{{ mediawiki_abs_path }}/LocalSettings.php" + args: + chdir: "{{ mediawiki_abs_path }}" + creates: "{{ mediawiki_abs_path }}/LocalSettings.php" - name: Copy mediawiki config file template: @@ -68,7 +68,7 @@ dest: "{{ mediawiki_abs_path }}/LocalSettings.php" owner: root group: "{{ apache_user }}" - mode: 0600 + mode: 0640 - name: Copy mediawiki httpd conf file template: diff --git a/roles/mediawiki/templates/LocalSettings.php.j2 b/roles/mediawiki/templates/LocalSettings.php.j2 index e4defcaf8..29546f93c 100644 --- a/roles/mediawiki/templates/LocalSettings.php.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.j2 @@ -25,7 +25,7 @@ $wgSitename = "{{ mediawiki_site_name }}"; ## For more information on customizing the URLs ## (like /w/index.php/Page_title to /wiki/Page_title) please see: ## https://www.mediawiki.org/wiki/Manual:Short_URL -$wgScriptPath = "{{ mediawiki_abs_path }}"; +$wgScriptPath = "{{ mediawiki_url }}"; ## The protocol and server name to use in fully-qualified URLs #$wgServer = "http://{{ iiab_hostname }}.{{ iiab_domain }}";