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..23baf1f4a 100644 --- a/roles/mysql/tasks/install.yml +++ b/roles/mysql/tasks/install.yml @@ -5,24 +5,18 @@ # - 7 DB config # - 2 record as installed -- name: 'Install MySQL packages: mariadb-server, mariadb-client, and 9 php packages (debuntu)' +- name: 'Install MySQL packages: mariadb-server, mariadb-client (debuntu)' package: name: - mariadb-server - 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 }}-mysql - - php-pear - - php{{ php_version }}-gd - - php{{ php_version }}-imap - - php{{ php_version }}-ldap - - php{{ php_version }}-odbc - - php{{ php_version }}-xml # Was below - - php{{ php_version }}-xmlrpc state: present when: is_debuntu | bool +# 2020-07-11: +# 10 PHP package installs moved to roles/www_base/tasks/main.yml +# php{{ php_version }}-sqlite3 install moved to roles/osm-vector-maps/tasks/install.yml + # - name: "Install packages: mysql, MySQL-python and 9 php packages (OS's other than debuntu)" # package: # name: diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index d50c414d4..c9e199ecc 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -1,3 +1,8 @@ +- name: Install php{{ php_version }}-sqlite3 + package: + name: "php{{ php_version }}-sqlite3" + state: present + - name: Ensure directory {{ vector_map_path }}/maplist/assets exists file: path: "{{ vector_map_path }}/maplist/assets" # /library/www/osm-vector-maps diff --git a/roles/www_base/tasks/main.yml b/roles/www_base/tasks/main.yml index 4ee7dd2a7..f19bea409 100644 --- a/roles/www_base/tasks/main.yml +++ b/roles/www_base/tasks/main.yml @@ -1,6 +1,24 @@ # Role "www_base" runs here, probably in 3-BASE-SERVER. # Role "www_options" runs later, likely in 4-SERVER-OPTIONS. +- name: 'Install ~10 PHP packages (debuntu)' + package: + name: + # - 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 }}-gd + - php{{ php_version }}-imap + - php{{ php_version }}-ldap + - php{{ php_version }}-mysql + - php{{ php_version }}-odbc + - php-pear + # - php{{ php_version }}-sqlite3 # 2020-07-10: Experimentally install this within roles/osm-vector-maps/tasks/install.yml only, as part of OSM fix PR #2464 for #2461. + - php{{ php_version }}-xml # Was below + - php{{ php_version }}-xmlrpc + state: present + when: is_debuntu | bool + - name: Using html.yml include_tasks: html.yml