From a1cd28962e3f19326b71a2b303c69d30a8651e82 Mon Sep 17 00:00:00 2001 From: Bec White Date: Wed, 5 Feb 2020 13:35:28 -0600 Subject: [PATCH 1/2] Remove user-specific provisioning and zsh configuration. --- .../provisioning/roles/common/tasks/main.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index 9eff6c5..c76d269 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -45,15 +45,6 @@ command: /usr/bin/git config --global core.excludesfile ~/.gitignore tags: common -- name: Check for user-specific provisioning script - stat: path=/var/www/{{ hostname }}/conf/provision-user - register: provision_user - -- name: Run user-specific provisioning. - command: /var/www/{{ hostname }}/conf/provision-user - when: provision_user.stat.exists - tags: common - - name: Ensure ~/bin exists file: path: /home/vagrant/bin @@ -69,14 +60,6 @@ lineinfile: dest=/home/vagrant/.profile state=present line='export PATH="$PATH:/var/www/{{ hostname }}/vendor/bin"' tags: common -- name: Add the ~/bin to the zsh path - lineinfile: dest=/home/vagrant/.zshrc state=present create=yes line='export PATH="$PATH:$HOME/bin"' - tags: drush - -- name: Add $HOME/bin and the project's vendor/bin to the zsh path - lineinfile: dest=/home/vagrant/.zshrc state=present create=yes line='export PATH="$PATH:$REPO/vendor/bin:$HOME/bin:/var/www/{{ hostname }}/vendor/bin"' - tags: common - - name: Change directory into the project root on login lineinfile: dest=/home/vagrant/.profile state=present line='cd /var/www/{{ hostname }}' tags: common From 391280c18060177e8f3b7fb1c1f457c952875359 Mon Sep 17 00:00:00 2001 From: Bec White Date: Wed, 5 Feb 2020 13:36:34 -0600 Subject: [PATCH 2/2] Update task names and tags for consistency. --- conf/vagrant/provisioning/roles/common/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index c76d269..4bed714 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -45,21 +45,21 @@ command: /usr/bin/git config --global core.excludesfile ~/.gitignore tags: common -- name: Ensure ~/bin exists +- name: Common | Ensure ~/bin exists file: path: /home/vagrant/bin state: directory owner: vagrant mode: '755' -- name: Add the ~/bin to the path +- name: Common | Add the ~/bin to the path lineinfile: dest=/home/vagrant/.profile state=present line='export PATH="$PATH:$HOME/bin"' - tags: drush + tags: common -- name: Add the project's vendor/bin to the path +- name: Common | Add the project's vendor/bin to the path lineinfile: dest=/home/vagrant/.profile state=present line='export PATH="$PATH:/var/www/{{ hostname }}/vendor/bin"' tags: common -- name: Change directory into the project root on login +- name: Common | Change directory into the project root on login lineinfile: dest=/home/vagrant/.profile state=present line='cd /var/www/{{ hostname }}' tags: common