diff --git a/roles/byzantine/molecule/default/verify.yml b/roles/byzantine/molecule/default/verify.yml index d6c9a3ba49..f26aa6ffc3 100644 --- a/roles/byzantine/molecule/default/verify.yml +++ b/roles/byzantine/molecule/default/verify.yml @@ -2,7 +2,7 @@ - name: Verify hosts: all vars: - - php_version: "8.1" + - php_version: "8.3" gather_facts: false tasks: - name: test for presence byzantine sudoer commands diff --git a/roles/drupal/tasks/main.yml b/roles/drupal/tasks/main.yml index 0d1e2a6bac..7141189450 100644 --- a/roles/drupal/tasks/main.yml +++ b/roles/drupal/tasks/main.yml @@ -194,4 +194,6 @@ - gulp-cli - gulp become: true - when: install_nodejs | default(true) + when: + - running_on_server + - install_nodejs | default(true) diff --git a/roles/drupal10/defaults/main.yml b/roles/drupal10/defaults/main.yml index 0cfdca721b..5e5c64c29e 100644 --- a/roles/drupal10/defaults/main.yml +++ b/roles/drupal10/defaults/main.yml @@ -12,6 +12,6 @@ trusted_host_patterns: drupal_base_dir: '/var/www' drupal_project: 'drupal10' drupal_docroot: "{{ drupal_base_dir }}/{{ drupal_project }}" -php_version: '8.1' -phpeol_version: '7.4' +php_version: '8.3' +phpeol_version: '8.1' php_webserver: 'nginx' diff --git a/roles/drupal10/molecule/default/verify.yml b/roles/drupal10/molecule/default/verify.yml index ddfd477178..e5ce0496c2 100644 --- a/roles/drupal10/molecule/default/verify.yml +++ b/roles/drupal10/molecule/default/verify.yml @@ -5,8 +5,8 @@ hosts: all gather_facts: false vars: - - php_version: "8.1" - - php_unwanted_version: "7.4" + - php_version: "8.3" + - php_unwanted_version: "8.1" tasks: - name: test for presence libwww apache config lineinfile: diff --git a/roles/ealapps/molecule/default/verify.yml b/roles/ealapps/molecule/default/verify.yml index d5ca148f48..855ab5a77a 100644 --- a/roles/ealapps/molecule/default/verify.yml +++ b/roles/ealapps/molecule/default/verify.yml @@ -3,16 +3,16 @@ hosts: all gather_facts: false tasks: - - name: check php curl status + - name: Check php curl status ansible.builtin.package: name: "{{ item }}" state: present check_mode: true register: pkg_status loop: - - php8.1-curl + - php8.3-curl - - name: test for ruby packages + - name: Test for PHP packages assert: that: - not pkg_status.changed diff --git a/roles/libwww/molecule/default/verify.yml b/roles/libwww/molecule/default/verify.yml index 2867a60bc2..6b9b450962 100644 --- a/roles/libwww/molecule/default/verify.yml +++ b/roles/libwww/molecule/default/verify.yml @@ -3,7 +3,7 @@ - name: Verify hosts: all vars: - - php_version: "8.0" + - php_version: "8.3" gather_facts: false tasks: - name: test for presence libwww apache config diff --git a/roles/libwww/vars/main.yml b/roles/libwww/vars/main.yml index 64c6246402..ae96ab8b6d 100644 --- a/roles/libwww/vars/main.yml +++ b/roles/libwww/vars/main.yml @@ -1,6 +1,6 @@ --- # vars file for roles/libwww -php_version: "8.1" +php_version: "8.3" app_db_host: "{{ db_host | default('localhost') }}" app_db_user: "{{ drupal_db_user | default('locator') }}" app_db_password: "{{ drupal_db_password | default('change_me') }}" diff --git a/roles/mysql/molecule/default/verify.yml b/roles/mysql/molecule/default/verify.yml index 887f931e31..26bca8af29 100644 --- a/roles/mysql/molecule/default/verify.yml +++ b/roles/mysql/molecule/default/verify.yml @@ -3,17 +3,16 @@ hosts: all gather_facts: false tasks: - - name: check mariadb package status + - name: Check mariadb package status ansible.builtin.package: name: "{{ item }}" state: present check_mode: true register: pkg_status loop: - - mariadb-server - - mysql-common + - mariadb-server-10.6 - - name: test for ruby packages + - name: Test for mariadb packages ansible.builtin.assert: that: - not pkg_status.changed diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index 796b60a0e9..d8a4367820 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -3,8 +3,11 @@ # - name: MySQL | Install pkg-config ansible.builtin.apt: - name: pkg-config - state: present + name: "{{ item }}" + state: present + loop: + - pkg-config + - python3-dev - name: MySQL | Install MariaDB key ansible.builtin.apt_key: @@ -28,13 +31,6 @@ when: - running_on_server -- name: MySQL | Install python database client packages - ansible.builtin.pip: - name: mysqlclient - changed_when: false - when: - - running_on_server - - name: MySQL | install mysql ansible.builtin.apt: name: "{{ mysql_packages }}" diff --git a/roles/mysql/vars/main.yml b/roles/mysql/vars/main.yml index c0f64838bd..3209281512 100644 --- a/roles/mysql/vars/main.yml +++ b/roles/mysql/vars/main.yml @@ -5,7 +5,7 @@ mysql_name: mariadb # please be sure that this will install mariadb mysql_packages: - - mariadb-server + - mariadb-server-10.6 - python3-mysqldb mysql_client_packages: diff --git a/roles/ojs/defaults/main.yml b/roles/ojs/defaults/main.yml index 462cc2022d..642777b199 100644 --- a/roles/ojs/defaults/main.yml +++ b/roles/ojs/defaults/main.yml @@ -1,7 +1,7 @@ --- # Note that ojs_version must match one of the downloadable packages from # https://pkp.sfu.ca/ojs/ojs_download/ -php_version: "8.1" +php_version: "8.3" ojs_version: "3.3.0-8" server: diff --git a/roles/php/defaults/main.yml b/roles/php/defaults/main.yml index 1674e40119..78d71c74d8 100644 --- a/roles/php/defaults/main.yml +++ b/roles/php/defaults/main.yml @@ -7,5 +7,5 @@ datadog_service_name: test datadog_environment: none php_memory_limit: '256M' php_webserver: 'apache2' -php_version: '8.1' -php_unwanted_version: '7.4' +php_version: '8.3' +php_unwanted_version: '8.1' diff --git a/roles/php/molecule/default/verify.yml b/roles/php/molecule/default/verify.yml index 825c3678c9..1f7ab5923e 100644 --- a/roles/php/molecule/default/verify.yml +++ b/roles/php/molecule/default/verify.yml @@ -1,19 +1,17 @@ --- -# This is an example playbook to execute Ansible tests. - - name: Verify hosts: all gather_facts: false tasks: - - name: test for php packages - apt: + - name: Test for php packages + ansible.builtin.apt: name: "{{ item }}" state: present loop: - - php8.1 - - php8.1-dev - - php8.1-curl - - php8.1-zip + - php8.3 + - php8.3-dev + - php8.3-curl + - php8.3-zip - datadog-php-tracer check_mode: true register: present diff --git a/roles/special_collections/molecule/default/verify.yml b/roles/special_collections/molecule/default/verify.yml index cd9187fb4d..de7b9614b1 100644 --- a/roles/special_collections/molecule/default/verify.yml +++ b/roles/special_collections/molecule/default/verify.yml @@ -2,7 +2,7 @@ - name: Verify hosts: all vars: - - php_version: "8.1" + - php_version: "8.3" gather_facts: false tasks: - name: test for presence special collection sudoer commands diff --git a/roles/video_reserves/molecule/default/verify.yml b/roles/video_reserves/molecule/default/verify.yml index 8dbb0ebfbd..ae078c52e6 100644 --- a/roles/video_reserves/molecule/default/verify.yml +++ b/roles/video_reserves/molecule/default/verify.yml @@ -3,7 +3,7 @@ hosts: all gather_facts: false vars: - - php_version: "8.1" + - php_version: "8.3" tasks: - name: check php curl status ansible.builtin.package: