From c06a6c98c941c6169f8474d7eda16989604b6049 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Jun 2020 14:01:26 -0400 Subject: [PATCH 1/6] roles/moodle/defaults/main.yml: Moodle 3.8.x -> 3.9.x --- roles/moodle/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml index c7d758108..788f9f748 100644 --- a/roles/moodle/defaults/main.yml +++ b/roles/moodle/defaults/main.yml @@ -7,7 +7,7 @@ # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! -moodle_version: 38 +moodle_version: 39 #moodle_repo_url: "https://github.com/moodle/moodle.git" moodle_repo_url: "git://git.moodle.org/moodle.git" moodle_base: "{{ iiab_base }}/moodle" # /opt/iiab From 23c5774fa8838cda08c4e0b7867c3670298ea4c0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Jun 2020 14:12:35 -0400 Subject: [PATCH 2/6] Cleanup: Moodle 3.9+ now requires phpX.Y-mbstring --- roles/moodle/tasks/install.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml index 33b3d9f08..0d1e39663 100644 --- a/roles/moodle/tasks/install.yml +++ b/roles/moodle/tasks/install.yml @@ -18,31 +18,31 @@ name: postgresql -- name: "Install packages: python-psycopg2, php-pgsql (OS's other than debuntu)" - package: - name: - - python-psycopg2 - - php-pgsql - state: present - when: not is_debuntu +# - name: "Install packages: python-psycopg2, php-pgsql (OS's other than debuntu)" +# package: +# name: +# - python-psycopg2 +# - php-pgsql +# state: present +# when: not is_debuntu - name: Install 4 php packages (debuntu) package: name: - php{{ php_version }}-pgsql - php{{ php_version }}-curl - #- php{{ php_version }}-zip + - php{{ php_version }}-zip - php{{ php_version }}-gd #- php{{ php_version }}-mbstring - # mbstring is now included in php-cli + # 2020-06-15: Above (phpX.Y-mbstring) is now required by Moodle 3.9+ ...and (apparently) included by phpX.Y-cli below: - php{{ php_version }}-cli state: present when: is_debuntu | bool -- name: "Install package: php{{ php_version }}-zip (Ubuntu or Debian 9+)" - package: - name: "php{{ php_version }}-zip" - when: is_ubuntu or (is_debian and not is_debian_8) +# - name: "Install package: php{{ php_version }}-zip (Ubuntu or Debian 9+)" +# package: +# name: "php{{ php_version }}-zip" +# when: is_ubuntu or (is_debian and not is_debian_8) # - name: "Install package: php-pclzip (debian-8)" # package: From f152518864bdb5c83eed45bff5422758f003af6d Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Jun 2020 14:35:14 -0400 Subject: [PATCH 3/6] Mandate mbstring for Moodle 3.9+ in moodle/tasks/install.yml --- roles/moodle/tasks/install.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml index 0d1e39663..e421c2e21 100644 --- a/roles/moodle/tasks/install.yml +++ b/roles/moodle/tasks/install.yml @@ -33,9 +33,8 @@ - php{{ php_version }}-curl - php{{ php_version }}-zip - php{{ php_version }}-gd - #- php{{ php_version }}-mbstring - # 2020-06-15: Above (phpX.Y-mbstring) is now required by Moodle 3.9+ ...and (apparently) included by phpX.Y-cli below: - - php{{ php_version }}-cli + - php{{ php_version }}-mbstring # 2020-06-15: Now required by Moodle 3.9+ + - php{{ php_version }}-cli # 2020-06-15: In the past this included (above) mbstring? However this is not true on Ubuntu Server 20.04 LTS. state: present when: is_debuntu | bool From bdf264b906a4a12656cd0ad087907ecb9f723b5d Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Jun 2020 16:04:34 -0400 Subject: [PATCH 4/6] httpd/tasks/install.yml: mandate libapache2-mod-php{{ php_version }} --- roles/httpd/tasks/install.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/roles/httpd/tasks/install.yml b/roles/httpd/tasks/install.yml index ddd1b55ad..f0b5d13a8 100644 --- a/roles/httpd/tasks/install.yml +++ b/roles/httpd/tasks/install.yml @@ -1,23 +1,24 @@ -- name: 'Install 3 packages: apache2, php{{ php_version }}, php{{ php_version }}-curl (debian)' +- name: 'Install 4 packages: apache2, libapache2-mod-php{{ php_version }}, php{{ php_version }}, php{{ php_version }}-curl' package: #name: [u'apache2', u'php{{ php_version }}', u'php{{ php_version }}-curl'] # FAILS ('u' for Unicode strings) #name: ['apache2', 'php{{ php_version }}', 'php{{ php_version }}-curl'] # WORKS? name: - "{{ apache_service }}" # apache2 on Debuntu + - "libapache2-mod-php{{ php_version }}" # 2020-06-15: Required (e.g. for Elgg, Moodle & possibly others) now that mysql/tasks/install.yml installs "php{{ php_version }}-common" rather than the full "php{{ php_version }}" - "php{{ php_version }}" - "php{{ php_version }}-curl" state: present - when: is_debian | bool +# when: is_debian | bool -- name: 'Install 2 packages: apache2, php (ubuntu)' - package: - #name: [u'apache2', u'php'] # FAILS ('u' for Unicode strings) - #name: ['apache2', 'php'] # WORKS - name: - - "{{ apache_service }}" # apache2 on Debuntu - - php - state: present - when: is_ubuntu | bool +# - name: 'Install 2 packages: apache2, php (ubuntu)' +# package: +# #name: [u'apache2', u'php'] # FAILS ('u' for Unicode strings) +# #name: ['apache2', 'php'] # WORKS +# name: +# - "{{ apache_service }}" # apache2 on Debuntu +# - php +# state: present +# when: is_ubuntu | bool # 2019-05-30: It's interesting that http://box.lan/admin and everything seems # to work even without php{{ php_version }}-sqlite3 as confirmed on Ubuntu From ec744071191efeba627763272603b31ce3b07207 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Jun 2020 16:06:43 -0400 Subject: [PATCH 5/6] Update elgg/tasks/install.yml --- roles/elgg/tasks/install.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/elgg/tasks/install.yml b/roles/elgg/tasks/install.yml index eb249c43a..f0e9f8483 100644 --- a/roles/elgg/tasks/install.yml +++ b/roles/elgg/tasks/install.yml @@ -7,11 +7,12 @@ include_role: name: httpd -# 2020-05-21: Required now that mysql/tasks/install.yml installs -# "php{{ php_version }}-common" rather than the full "php{{ php_version }}" -- name: "Install package: libapache2-mod-php{{ php_version }}" - package: - name: "libapache2-mod-php{{ php_version }}" +# 2020-06-15: roles/httpd/tasks/install.yml now takes care of this. +# # 2020-05-21: Required now that mysql/tasks/install.yml installs +# # "php{{ php_version }}-common" rather than the full "php{{ php_version }}" +# - name: "Install package: libapache2-mod-php{{ php_version }}" +# package: +# name: "libapache2-mod-php{{ php_version }}" # Assume (enforce?) MySQL is running # From 9e3a546253191e70894974afc95412578d67f503 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Jun 2020 16:13:53 -0400 Subject: [PATCH 6/6] Update httpd/tasks/install.yml --- roles/httpd/tasks/install.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/httpd/tasks/install.yml b/roles/httpd/tasks/install.yml index f0b5d13a8..e5f919821 100644 --- a/roles/httpd/tasks/install.yml +++ b/roles/httpd/tasks/install.yml @@ -8,6 +8,7 @@ - "php{{ php_version }}" - "php{{ php_version }}-curl" state: present + when: is_debuntu | bool # when: is_debian | bool # - name: 'Install 2 packages: apache2, php (ubuntu)'