From 0fe558f518dd904dcaefa677ffb504c0ed7d5f7b 2021-01-18 20:45:11
From: Branko Majic <branko@majic.rs>
Date: 2021-01-18 20:45:11
Subject: [PATCH] MAR-151: Update usage instructions for setting-up PHP web application (The Bug Genie):

- Updated The Bug Genie to version 4.3.1.
- Updated version of Composer used. Stay away from version 2.x due to
  idempotency problems in Ansible module (see
  https://github.com/ansible-collections/community.general/issues/1179).
- Fix required version for lib-pcre since Debian Buster links agains
  lib-pcre 10. This should still work fine.
- Instead of listing plaintext web URLs, list just the HTTPS ones.

---

diff --git a/docs/usage.rst b/docs/usage.rst
index 08b3d2ec2d25e5d7b08cae864f5c26eee0a6acb5..ce838f8719856baf58765811a656078ccf6f36fa 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -1470,7 +1470,8 @@ Before we start, here is a couple of useful pointers regarding the
             - php-xml
             - git
             - php-mysql
-            - expect
+            - php-apcu
+            - php-zip
           # Set-up URL rewriting. This is based on public/.htaccess file from
           # TBG.
           php_rewrite_urls:
@@ -1523,8 +1524,8 @@ Before we start, here is a couple of useful pointers regarding the
 
       - name: Define TBG version
         set_fact:
-          tbg_version: "4.2.0"
-          tbg_archive_checksum: "ca3a8b9d8090ec5f75580803abf699c5e67bdea0ec043dd782e525a774cf0936"
+          tbg_version: "4.3.1"
+          tbg_archive_checksum: "45de72b1ef82142ad46686577d593375ba370156df4367d17386b4e26a37f342"
 
       - name: Download the TBG archive
         get_url:
@@ -1536,9 +1537,9 @@ Before we start, here is a couple of useful pointers regarding the
 
       - name: Download Composer
         get_url:
-          url: "https://getcomposer.org/download/1.7.2/composer.phar"
+          url: "https://getcomposer.org/download/1.10.19/composer.phar"
           dest: "/usr/local/bin/composer"
-          sha256sum: "ec3428d049ae8877f7d102c2ee050dbd51a160fc2dde323f3e126a3b3846750e"
+          sha256sum: "688bf8f868643b420dded326614fcdf969572ac8ad7fbbb92c28a631157d39e8"
           owner: root
           group: root
           mode: 0755
@@ -1552,6 +1553,16 @@ Before we start, here is a couple of useful pointers regarding the
         become: yes
         become_user: admin-tbg_example_com
 
+      - name: Allow use of lib-pcre version 10 (since PHP is built against it in Debian Buster)
+        lineinfile:
+          dest: "/var/www/tbg.example.com/thebuggenie-{{ tbg_version }}/{{ item }}"
+          state: present
+          regexp: '.*"lib-pcre".*'
+          line: '        "lib-pcre": ">=8.0",'
+        with_items:
+          - "composer.json"
+          - "composer.lock"
+
       - name: Create TBG cache directory
         file:
           path: "/var/www/tbg.example.com/thebuggenie-{{ tbg_version }}/cache"
@@ -1691,8 +1702,7 @@ Before we start, here is a couple of useful pointers regarding the
      workon mysite && ansible-playbook playbooks/site.yml
 
 8. At this point *The Bug Genie* has been installed, and you should be able to
-   open the URL https://tbg.example.com/ (if you open http://tbg.example.com/ ,
-   you will be redirected to the HTTPS URL) and log-in into *The Bug Genie*
+   open the URL https://tbg.example.com/ and log-in into *The Bug Genie*
    with username ``administrator`` and password ``admin``.
 
 
@@ -2123,8 +2133,7 @@ on the safe side:
      workon mysite && ansible-playbook playbooks/site.yml
 
 8. At this point Django Wiki has been installed, and you should be able to open
-   the URL https://wiki.example.com/ (if you open http://wiki.example.com/ , you
-   will be redirected to the HTTPS URL) and log-in into *Django Wiki* with
+   the URL https://wiki.example.com/ and log-in into *Django Wiki* with
    username ``admin`` and password ``admin``.