diff --git a/roles/httpd/tasks/install.yml b/roles/httpd/tasks/install.yml index e5f919821..ddb4a48ce 100644 --- a/roles/httpd/tasks/install.yml +++ b/roles/httpd/tasks/install.yml @@ -5,8 +5,8 @@ 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" +# - "php{{ php_version }}" +# - "php{{ php_version }}-curl" state: present when: is_debuntu | bool # when: is_debian | bool @@ -32,12 +32,12 @@ # is the only role that needs it? # # Legacy Comment: SQLite3 no longer included in another package -- name: Install php{{ php_version }}-sqlite3 (raspbian-9+ or debian-9+ or ubuntu-18+) - package: - name: "php{{ php_version }}-sqlite3" - #when: is_raspbian_9 or is_debian_9 or is_ubuntu_18 - when: is_debuntu and (not is_debian_8) and (not is_ubuntu_16) - #when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18 +#- name: Install php{{ php_version }}-sqlite3 (raspbian-9+ or debian-9+ or ubuntu-18+) +# package: +# name: "php{{ php_version }}-sqlite3" +# #when: is_raspbian_9 or is_debian_9 or is_ubuntu_18 +# when: is_debuntu and (not is_debian_8) and (not is_ubuntu_16) +# #when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18 - name: 'Install 4 packages: httpd, mod_authnz_external, php, php-curl (redhat)' package: diff --git a/roles/mysql/tasks/install.yml b/roles/mysql/tasks/install.yml index 9c7d5678f..4b5104799 100644 --- a/roles/mysql/tasks/install.yml +++ b/roles/mysql/tasks/install.yml @@ -12,12 +12,14 @@ - mariadb-client # - php{{ php_version }} # On Ubuntu 20.04 (and prob other OS's) this forces the install of: apache2 apache2-bin apache2-data apache2-utils libapache2-mod-php{{ php_version }} ETC - php{{ php_version }}-common # 2020-05-21: @jvonau suggests this to avoid Apache above. Or its superset php{{ php_version }}-cli if absolutely nec? + - php{{ php_version }}-curl - php{{ php_version }}-mysql - php-pear - php{{ php_version }}-gd - php{{ php_version }}-imap - php{{ php_version }}-ldap - php{{ php_version }}-odbc + - php{{ php_version }}-sqlite3 - php{{ php_version }}-xml # Was below - php{{ php_version }}-xmlrpc state: present