Merge branch 'master' of https://github.com/roots/trellis

creame · Jul 17, 2024 · 6739b98 · 6739b98
2 parents 1e194b5 + fbd8b41
commit 6739b98
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml
@@ -2,7 +2,7 @@
 vault_mail_password: smtp_password
 
 # Variables to accompany `wordpress_env_defaults` in `group_vars/all/helpers.yml`
-# Note: These values can be overriden by `vault_wordpress_sites.*.env`
+# Note: These values can be overridden by `vault_wordpress_sites.*.env`
 #
 # vault_wordpress_env_defaults:
 #   my_api_key: 'available to all environments'
diff --git a/lib/trellis/vagrant.rb b/lib/trellis/vagrant.rb
@@ -105,7 +105,7 @@ def update_ssh_config(main_hostname)
   config_file = File.expand_path('~/.ssh/config')
   vagrant_ssh_config = `vagrant ssh-config --host #{main_hostname}`.chomp
 
-  if File.exists?(config_file)
+  if File.exist?(config_file)
     FileUtils.cp(config_file, "#{config_file}.trellis_backup")
     ssh_config = File.read(config_file)
 

diff --git a/roles/wordpress-install/tasks/composer-authentications.yml b/roles/wordpress-install/tasks/composer-authentications.yml
@@ -19,6 +19,7 @@
     command: config
     arguments: --auth bitbucket-oauth.{{ item.hostname | quote }} {{ item.consumer_key | quote }} {{ item.consumer_secret | quote }}
     working_dir: "{{ working_dir }}"
+  become: no
   no_log: true
   changed_when: false
   when:
@@ -34,6 +35,7 @@
     command: config
     arguments: --auth {{ item.type | quote }}.{{ item.hostname | quote }} {{ item.token | quote }}
     working_dir: "{{ working_dir }}"
+  become: no
   no_log: true
   changed_when: false
   when: