diff --git a/roles/mediawiki/defaults/main.yml b/roles/mediawiki/defaults/main.yml index ccd97b8f3..cb1420648 100644 --- a/roles/mediawiki/defaults/main.yml +++ b/roles/mediawiki/defaults/main.yml @@ -1,22 +1,24 @@ -mediawiki_major_version: "1.29" -mediawiki_minor_version: ".1" +mediawiki_major_version: "1.30" +mediawiki_minor_version: "0" +mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}" + mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}" -mediawiki_src: "mediawiki-{{ mediawiki_major_version }}{{ mediawiki_minor_version }}.tar.gz" +mediawiki_src: "mediawiki-{{ mediawiki_version }}.tar.gz" mediawiki_db_name: iiab_mediawiki mediawiki_db_user: iiab_mediawiki_user mediawiki_db_user_password: changeme +mediawiki_admin_user: Admin +mediawiki_admin_user_password: changeme + mediawiki_site_name: Community Wiki mediawiki_install: True mediawiki_enabled: True mediawiki_install_path: "{{ content_base }}" -#mediawiki_install_path: /library - -mediawiki_abs_path: "{{ mediawiki_install_path }}/mediawiki" -#mediawiki_abs_path: /library/mediawiki +mediawiki_abs_path: "{{ mediawiki_install_path }}/{{ mediawiki_src }}" mediawiki_url: /mediawiki -mediawiki_full_url: "http://{{ iiab_hostname }}{{ mediawiki_url }}" +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 a2bc95f33..f61b64dff 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -2,8 +2,8 @@ package: name={{ item }} state=present with_items: - - php7.0-intl - - php7.0-mbstring + - {{ php_version }}-intl + - {{ php_version }}-mbstring tags: - download @@ -17,54 +17,15 @@ register: mediawiki_download_output when: internet_available -- name: Create link /opt/iiab/downloads/mediawiki.tar.gz pointing to {{ mediawiki_download_output.dest }} - file: - src: "{{ mediawiki_download_output.dest }}" - dest: "{{ downloads_dir }}/mediawiki.tar.gz" - state: link - when: mediawiki_download_output.dest is defined - -- name: Check if /opt/iiab/downloads/mediawiki.tar.gz link exists - stat: - path: "{{ downloads_dir }}/mediawiki.tar.gz" - register: mediawiki_link - -- name: FAIL (force Ansible to exit) IF /opt/iiab/downloads/mediawiki.tar.gz doesn't exist - fail: - msg: "{{ downloads_dir }}/mediawiki.tar.gz is REQUIRED in order to install mediawiki." - when: not mediawiki_link.stat.exists - - name: Unpack download to permanent location unarchive: - src: "{{ downloads_dir }}/mediawiki.tar.gz" + src: "{{ downloads_dir }}/{{ mediawiki_src }}" dest: "{{ mediawiki_install_path }}" owner: root group: "{{ apache_user }}" mode: 0755 keep_newer: yes -- name: Create link mediawiki to version - file: - src: "{{ mediawiki_install_path }}/mediawiki-{{ mediawiki_major_version }}{{ mediawiki_minor_version }}" - dest: "{{ mediawiki_abs_path }}" - owner: root - group: "{{ apache_user }}" - state: link - -# - name: Rename /library/mediawiki* to /library/mediawiki -# shell: if [ ! -d {{ mediawiki_abs_path }} ]; then mv {{ mediawiki_abs_path }}* {{ mediawiki_abs_path }}; fi - -#- name: Make Apache owner and group, 1st pass permissions set to 0664 -# file: path={{ mediawiki_abs_path }} -# recurse=yes -# owner=root -# group={{ apache_user }} -# mode=0664 -# state=directory - -- name: Make MediaWiki install directories 775 so Apache can traverse and write (most files remain 0664) - command: "/usr/bin/find {{ mediawiki_abs_path }} -type d -exec chmod 775 {} +" - - name: MySQL database needs to be running if we are trying to create a new db service: state: started @@ -82,6 +43,25 @@ priv: "{{ mediawiki_db_name }}.*:ALL,GRANT" state: present +- name: Configure MediaWiki + shell: > + php '{{ mediawiki_abs_path }}/maintenance/install.php' + --dbname={{ mediawiki_db_name }} + --dbserver="localhost" + --installdbuser={{ mediawiki_db_user }} + --installdbpass={{ mediawiki_db_user_password }} + --dbuser={{ mediawiki_db_user }} + --dbpass={{ mediawiki_db_user_password }} + --server="{{ iiab_hostname }}.{{ iiab_domain }}" + --scriptpath=/mediawiki + --lang=en + --pass={{ mediawiki_admin_user_password }} + "{{ mediawiki_site_name }}" + "{{ mediawiki_admin_user }}" + args: + chdir: "{{ mediawiki_abs_path }}" + creates: "{{ mediawiki_abs_path }}/LocalSettings.php" + - name: Copy mediawiki config file template: src: LocalSettings.php.j2 diff --git a/roles/mediawiki/templates/mediawiki.conf.j2 b/roles/mediawiki/templates/mediawiki.conf.j2 index 347276617..1da5e193b 100644 --- a/roles/mediawiki/templates/mediawiki.conf.j2 +++ b/roles/mediawiki/templates/mediawiki.conf.j2 @@ -1,5 +1,3 @@ -RewriteEngine on - Alias {{ mediawiki_url }} {{ mediawiki_abs_path }} Options Indexes FollowSymLinks