From dd49efbcad47f7d9e801bb12758183220dae9c86 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 23 Sep 2018 11:36:13 +0200 Subject: o Replacing all custom semantic mediawiki configuration with a generic composer setup. Should be possible to maintain all of the mediawiki code with composer now. o Adding scribunto and semantic-scribunto as extensions. o Moving borg and backup directory under /opt/mediawiki --- ansible/roles/mw-backend/tasks/main.yml | 59 +++++++++++----- .../roles/mw-backend/tasks/semantic-mediawiki.yml | 78 ---------------------- 2 files changed, 41 insertions(+), 96 deletions(-) delete mode 100644 ansible/roles/mw-backend/tasks/semantic-mediawiki.yml (limited to 'ansible/roles/mw-backend/tasks') diff --git a/ansible/roles/mw-backend/tasks/main.yml b/ansible/roles/mw-backend/tasks/main.yml index a172b9a..f5d3e67 100644 --- a/ansible/roles/mw-backend/tasks/main.yml +++ b/ansible/roles/mw-backend/tasks/main.yml @@ -13,13 +13,9 @@ dest: /etc/apt/sources.list content: | deb http://httpredir.debian.org/debian/ stretch main contrib non-free - deb-src http://httpredir.debian.org/debian/ stretch main contrib non-free - deb http://security.debian.org/debian-security stretch/updates main contrib non-free - deb-src http://security.debian.org/debian-security stretch/updates main contrib non-free - deb http://httpredir.debian.org/debian/ stretch-updates main contrib non-free - deb-src http://httpredir.debian.org/debian/ stretch-updates main contrib non-free + deb http://httpredir.debian.org/debian/ stretch-backports main contrib non-free - meta: flush_handlers @@ -68,7 +64,9 @@ - php-intl - php-gd - php-apcu - - mediawiki + - composer + - php-zip + - mediawiki # TODO: this should be replaced with composer - name: /var/www/mw.trygvis.io tags: apache-config file: @@ -101,6 +99,40 @@ state: started name: mw-jobqueue.timer +- name: Mediawiki extensions + tags: mw-extensions + block: + - name: directories + file: + state: directory + path: /opt/mediawiki/extensions + owner: www-data + group: root + + - name: run composer install scribunto + with_items: "{{ mediawiki_extensions }}" + become: yes + become_user: www-data + composer: + command: require + arguments: "{{ item.package }} {{ item.version }}" + working_dir: /opt/mediawiki/extensions + + - name: symlink extensions into mediawiki + with_items: "{{ mediawiki_extensions }}" + file: + state: link + dest: "/var/lib/mediawiki/extensions/{{ item.extension }}" + src: "/opt/mediawiki/extensions/extensions/{{ item.extension }}" + + - name: symlink maintenance into smw + file: + state: link + dest: "/opt/mediawiki/extensions/maintenance" + src: "/var/lib/mediawiki/maintenance" + owner: root + group: root + - name: Mediawiki Backup tags: - mw-backend @@ -113,16 +145,14 @@ with_items: - borgbackup - name: mkdir - with_items: - - /mediawiki-backup file: state: directory - path: "{{ item }}" + path: "/opt/mediawiki/backup" - name: borgbackup init - shell: borgbackup init -e none /mediawiki-borg + shell: borgbackup init -e none /opt/mediawiki/borg args: - creates: /mediawiki-borg + creates: /opt/mediawiki/borg - copy: src: "{{ item }}" @@ -132,10 +162,3 @@ - bin/mw-dump-backup - bin/mw-dump-db - bin/mw-make-backup - -- name: Semantic MediaWiki - tags: - - mw-backend - - smw - block: - - include_tasks: semantic-mediawiki.yml diff --git a/ansible/roles/mw-backend/tasks/semantic-mediawiki.yml b/ansible/roles/mw-backend/tasks/semantic-mediawiki.yml deleted file mode 100644 index c035ce3..0000000 --- a/ansible/roles/mw-backend/tasks/semantic-mediawiki.yml +++ /dev/null @@ -1,78 +0,0 @@ -- name: packages - apt: - name: "{{ item }}" - install_recommends: no - with_items: - - composer - - php-zip -- name: directories - file: - state: directory - path: /opt/mediawiki - owner: root - group: root -- name: directories - file: - state: directory - path: /opt/mediawiki/semantic-media-wiki - owner: www-data - group: root - -- name: composer config - copy: - src: opt/mediawiki/semantic-media-wiki/composer.json - dest: /opt/mediawiki/semantic-media-wiki/composer.json - -- tags: composer - block: - - name: run composer update - become: yes - become_user: www-data - register: run_composer_update - composer: - command: update - working_dir: /opt/mediawiki/semantic-media-wiki - - - name: composer update stdout - debug: var=run_composer_update.stdout_lines - when: run_composer_update.stdout_lines is defined - - - name: composer update stderr - debug: var=run_composer_update.stderr_lines - when: run_composer_update.stderr_lines is defined - -- tags: composer - block: - - name: run composer install - tags: composer - become: yes - become_user: www-data - register: run_composer_install - composer: - command: install - working_dir: /opt/mediawiki/semantic-media-wiki - - - name: composer install stdout - debug: var=run_composer_install.stdout_lines - when: run_composer_install.stdout_lines is defined - - - name: composer install stderr - debug: var=run_composer_install.stderr_lines - when: run_composer_install.stderr_lines is defined - -- name: symlink smw into mw extensions - file: - state: link - dest: "/var/lib/mediawiki/extensions/{{ item }}" - src: "/opt/mediawiki/semantic-media-wiki/extensions/{{ item }}" - with_items: - - SemanticMediaWiki - - SemanticResultFormats - -- name: symlink maintenance into smw - file: - state: link - dest: "/opt/mediawiki/semantic-media-wiki/maintenance" - src: "/var/lib/mediawiki/maintenance" - owner: root - group: root -- cgit v1.2.3