From ef940b797ec699121c1580daacf000517419fd39 Mon Sep 17 00:00:00 2001
From: Eli Zoller <zoller.eli@gmail.com>
Date: Tue, 1 Sep 2020 05:57:28 -0700
Subject: [PATCH 1/5] remove dependency on geerlingguy drupal console ansible
 role because composer installs it just fine

---
 requirements.yml | 3 ---
 webserver.yml    | 1 -
 2 files changed, 4 deletions(-)

diff --git a/requirements.yml b/requirements.yml
index 44b46964..5449c0c0 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -40,9 +40,6 @@
 - src: geerlingguy.drush
   version: 3.1.1
 
-- src: geerlingguy.drupal-console
-  version: 1.1.1
-
 - src: https://github.com/Islandora-Devops/ansible-role-activemq
   name: Islandora-Devops.activemq
   version: master
diff --git a/webserver.yml b/webserver.yml
index eb22b046..916b31ac 100644
--- a/webserver.yml
+++ b/webserver.yml
@@ -19,7 +19,6 @@
     - geerlingguy.git
     - geerlingguy.composer
     - geerlingguy.drush
-    - geerlingguy.drupal-console
     - geerlingguy.drupal
     - perms-fix
     - Islandora-Devops.drupal-openseadragon

From 470e3de003cffea39d70076ab881055105454fca Mon Sep 17 00:00:00 2001
From: Eli Zoller <zoller.eli@gmail.com>
Date: Tue, 1 Sep 2020 08:22:41 -0700
Subject: [PATCH 2/5] add path to bash profile

---
 roles/internal/webserver-app/tasks/drupal.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/roles/internal/webserver-app/tasks/drupal.yml b/roles/internal/webserver-app/tasks/drupal.yml
index b19594b9..80ce3f70 100644
--- a/roles/internal/webserver-app/tasks/drupal.yml
+++ b/roles/internal/webserver-app/tasks/drupal.yml
@@ -106,3 +106,10 @@
     dest: "{{ drupal_external_libraries_directory }}/pdf.js"
     creates: "{{ drupal_external_libraries_directory }}/pdf.js/build"
     remote_src: yes
+
+- name: Add project's /vendor/bin to $PATH
+  lineinfile:
+    path: ~/.profile
+    line: 'PATH="$PATH:{{ webserver_document_root }}/drupal/vendor/bin"'
+    state: present
+  become: false

From 9841a946d159b1d486ffdf9cd81b37f627eaf87c Mon Sep 17 00:00:00 2001
From: Eli Zoller <zoller.eli@gmail.com>
Date: Tue, 1 Sep 2020 09:32:10 -0700
Subject: [PATCH 3/5] conditional for different profile location in centos

---
 roles/internal/webserver-app/tasks/drupal.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/roles/internal/webserver-app/tasks/drupal.yml b/roles/internal/webserver-app/tasks/drupal.yml
index 80ce3f70..316a988c 100644
--- a/roles/internal/webserver-app/tasks/drupal.yml
+++ b/roles/internal/webserver-app/tasks/drupal.yml
@@ -113,3 +113,13 @@
     line: 'PATH="$PATH:{{ webserver_document_root }}/drupal/vendor/bin"'
     state: present
   become: false
+  when: ansible_os_family == "Debian"
+
+- name: 
+  lineinfile:
+    path: ~/bash.profile
+    line: 'PATH="$PATH:{{ webserver_document_root }}/drupal/vendor/bin"'
+    state: present
+  become: false
+  when: ansible_os_family == "RedHat"
+

From 4a44d0ace0dfb7fe90c42daa8baa560085798b2c Mon Sep 17 00:00:00 2001
From: Eli Zoller <zoller.eli@gmail.com>
Date: Tue, 1 Sep 2020 10:36:46 -0700
Subject: [PATCH 4/5] fix bash profile location in centos

---
 roles/internal/webserver-app/tasks/drupal.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/internal/webserver-app/tasks/drupal.yml b/roles/internal/webserver-app/tasks/drupal.yml
index 316a988c..64aba6d3 100644
--- a/roles/internal/webserver-app/tasks/drupal.yml
+++ b/roles/internal/webserver-app/tasks/drupal.yml
@@ -117,7 +117,7 @@
 
 - name: 
   lineinfile:
-    path: ~/bash.profile
+    path: ~/.bash_profile
     line: 'PATH="$PATH:{{ webserver_document_root }}/drupal/vendor/bin"'
     state: present
   become: false

From e6d38ab6c93112d62d60796cb85e4880c460cce9 Mon Sep 17 00:00:00 2001
From: Eli Zoller <zoller.eli@gmail.com>
Date: Tue, 1 Sep 2020 11:14:25 -0700
Subject: [PATCH 5/5] improve task names

---
 roles/internal/webserver-app/tasks/drupal.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/internal/webserver-app/tasks/drupal.yml b/roles/internal/webserver-app/tasks/drupal.yml
index 64aba6d3..f6a964d6 100644
--- a/roles/internal/webserver-app/tasks/drupal.yml
+++ b/roles/internal/webserver-app/tasks/drupal.yml
@@ -107,7 +107,7 @@
     creates: "{{ drupal_external_libraries_directory }}/pdf.js/build"
     remote_src: yes
 
-- name: Add project's /vendor/bin to $PATH
+- name: Add project's /vendor/bin to $PATH (ubuntu)
   lineinfile:
     path: ~/.profile
     line: 'PATH="$PATH:{{ webserver_document_root }}/drupal/vendor/bin"'
@@ -115,7 +115,7 @@
   become: false
   when: ansible_os_family == "Debian"
 
-- name: 
+- name: Add project's /vendor/bin to $PATH (centos)
   lineinfile:
     path: ~/.bash_profile
     line: 'PATH="$PATH:{{ webserver_document_root }}/drupal/vendor/bin"'