From fcafede2f6cfaea9539c2d2918fde079c73454f2 Mon Sep 17 00:00:00 2001 From: Dale Grant Date: Mon, 15 May 2023 23:48:08 +1000 Subject: [PATCH 1/5] Fix issue with variable name 'site' clashing when setting composer authentications. (#1488) --- roles/wordpress-install/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/wordpress-install/tasks/main.yml b/roles/wordpress-install/tasks/main.yml index 5e3ca096e3..6119154b47 100644 --- a/roles/wordpress-install/tasks/main.yml +++ b/roles/wordpress-install/tasks/main.yml @@ -18,13 +18,13 @@ - include_tasks: tasks/composer-authentications.yml vars: - site: "{{ site.key }}" - working_dir: "{{ www_root }}/{{ site.key }}/{{ site.value.current_path | default('current') }}/" + site: "{{ loop_item.key }}" + working_dir: "{{ www_root }}/{{ loop_item.key }}/{{ loop_item.value.current_path | default('current') }}/" no_log: true loop: "{{ wordpress_sites | dict2items }}" loop_control: - loop_var: site - label: "{{ site.key }}" + loop_var: loop_item # cannot be 'item' or 'site'. + label: "{{ loop_item.key }}" - name: Install Dependencies with Composer composer: From 268509ad853080382459be65961d08dbc7a2f86b Mon Sep 17 00:00:00 2001 From: Hylke Hellinga Date: Fri, 26 May 2023 20:56:30 +0200 Subject: [PATCH 2/5] Add libvirt support to Vagrant (#1490) Gives the ability for users who have the libvirt plugin installed on linux to use libvirt/kvm for creating the virtual machine. This change will make sure that the RAM and CPU count will be properly set on each trellis up. --- Vagrantfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index ea5178a36a..34cdd3270f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -208,4 +208,11 @@ Vagrant.configure('2') do |config| h.enable_virtualization_extensions = true h.linked_clone = true end + + # Libvirt/KVM settings + config.vm.provider 'libvirt' do [lv] + lv.vmname = config.vm.hostname + lv.cpus = vconfig.fetch('vagrant_cpus') + lv.memory = vconfig.fetch('vagrant_memory') + end end From f62a57c03853be96220ded6f21f40025098990cd Mon Sep 17 00:00:00 2001 From: Hylke Hellinga Date: Sat, 27 May 2023 18:11:39 +0200 Subject: [PATCH 3/5] Fix libvirt vagrant provider config * Change vmname to title for libvirt vagrant provider * Added KVM Acceleration to the VM. In order for a more accelerated virtual machine, KVM needs to be installed and set as the driver, so that the VM will be a lot faster. --- Vagrantfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 34cdd3270f..4997060552 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -210,8 +210,9 @@ Vagrant.configure('2') do |config| end # Libvirt/KVM settings - config.vm.provider 'libvirt' do [lv] - lv.vmname = config.vm.hostname + config.vm.provider 'libvirt' do |lv| + lv.driver = "kvm" + lv.title = config.vm.hostname lv.cpus = vconfig.fetch('vagrant_cpus') lv.memory = vconfig.fetch('vagrant_memory') end From aa136d3480e581e9fc310e14378decb2d55481f1 Mon Sep 17 00:00:00 2001 From: Risto Kaalma <25532263+rkaalma@users.noreply.github.com> Date: Tue, 30 May 2023 05:34:55 +0300 Subject: [PATCH 4/5] Update Bitbucket Cloud SSH Host Keys (#1492) --- group_vars/all/known_hosts.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/group_vars/all/known_hosts.yml b/group_vars/all/known_hosts.yml index 1db951997f..e337816980 100644 --- a/group_vars/all/known_hosts.yml +++ b/group_vars/all/known_hosts.yml @@ -9,7 +9,9 @@ known_hosts: - name: github.com key: github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl - name: bitbucket.org - key: bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw== + key: bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQeJzhupRu0u0cdegZIa8e86EG2qOCsIsD1Xw0xSeiPDlCr7kq97NLmMbpKTX6Esc30NuoqEEHCuc7yWtwp8dI76EEEB1VqY9QJq6vk+aySyboD5QF61I/1WeTwu+deCbgKMGbUijeXhtfbxSxm6JwGrXrhBdofTsbKRUsrN1WoNgUa8uqN1Vx6WAJw1JHPhglEGGHea6QICwJOAr/6mrui/oB7pkaWKHj3z7d1IC4KWLtY47elvjbaTlkN04Kc/5LFEirorGYVbt15kAUlqGM65pk6ZBxtaO3+30LVlORZkxOh+LKL/BvbZ/iRNhItLqNyieoQj/uh/7Iv4uyH/cV/0b4WDSd3DptigWq84lJubb9t/DnZlrJazxyDCulTmKdOR7vs9gMTo+uoIrPSb8ScTtvw65+odKAlBj59dhnVp9zd7QUojOpXlL62Aw56U4oO+FALuevvMjiWeavKhJqlR7i5n9srYcrNV7ttmDw7kf/97P5zauIhxcjX+xHv4M= + - name: bitbucket.org + key: bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO - name: gitlab.com key: gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf - name: gitlab.com From 5642f8658dc8463a8b2aa6c65fdb7f2bb427cbe0 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Mon, 5 Jun 2023 10:54:31 -0500 Subject: [PATCH 5/5] Update `wp_cli_version` to 2.8.0 (#1493) --- roles/wp-cli/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wp-cli/defaults/main.yml b/roles/wp-cli/defaults/main.yml index 18dacfd053..8c5005924e 100644 --- a/roles/wp-cli/defaults/main.yml +++ b/roles/wp-cli/defaults/main.yml @@ -1,5 +1,5 @@ gpg2_package: gnupg2 -wp_cli_version: 2.7.1 +wp_cli_version: 2.8.0 wp_cli_bin_path: /usr/bin/wp wp_cli_phar_url: "https://github.com/wp-cli/wp-cli/releases/download/v{{ wp_cli_version }}/wp-cli-{{ wp_cli_version }}.phar" wp_cli_phar_asc_url: "https://github.com/wp-cli/wp-cli/releases/download/v{{ wp_cli_version }}/wp-cli-{{ wp_cli_version }}.phar.asc"