From d653252a9f1fbf59a4cfe3771e79a146fc4973a6 Mon Sep 17 00:00:00 2001
From: Daniel Tomlinson <dtomlinson@panaetius.co.uk>
Date: Sun, 11 Jul 2021 23:35:59 +0100
Subject: [PATCH] adding latest

---
 hosts                           |  2 +-
 provision.yml                   |  1 +
 roles/npm/tasks/main.yml        |  6 ++++
 roles/setup/tasks/main.yml      | 60 ++++++++++++++++-----------------
 roles/shell/templates/.zshrc.j2 |  2 +-
 5 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/hosts b/hosts
index 6e63ffd..681e7b2 100644
--- a/hosts
+++ b/hosts
@@ -1,7 +1,7 @@
 ---
 all:
   hosts:
-    116.203.200.219:
+    116.203.223.205:
   vars:
     ansible_user: "root"
     ansible_ssh_private_key_file: ~/.ssh/id_rsa
diff --git a/provision.yml b/provision.yml
index 84377d4..f1bf604 100644
--- a/provision.yml
+++ b/provision.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: all
+# mac overrides
 # - hosts: 127.0.0.1
 #   connection: local
 
diff --git a/roles/npm/tasks/main.yml b/roles/npm/tasks/main.yml
index 7cba066..12b1402 100644
--- a/roles/npm/tasks/main.yml
+++ b/roles/npm/tasks/main.yml
@@ -11,9 +11,15 @@
 
     - name: Install latest node/npm
       shell: "source {{ default_user_home }}/.nvm/nvm.sh && nvm install node"
+      args:
+        executable: /bin/bash
 
     - name: Activate latest version
       shell: "source {{ default_user_home }}/.nvm/nvm.sh && nvm use node"
+      args:
+        executable: /bin/bash
 
     - name: Install Yarn
       shell: "source {{ default_user_home }}/.nvm/nvm.sh && npm install -g yarn"
+      args:
+        executable: /bin/bash
diff --git a/roles/setup/tasks/main.yml b/roles/setup/tasks/main.yml
index 54a00cc..7097f34 100644
--- a/roles/setup/tasks/main.yml
+++ b/roles/setup/tasks/main.yml
@@ -71,39 +71,39 @@
         - restart ntp
         - restart cron
 
-    - name: Set up exim4 conf
-      template:
-        src: update-exim4.conf.conf.j2
-        dest: /etc/exim4/update-exim4.conf.conf
-        owner: root
-        group: root
-        mode: 0644
+    # - name: Set up exim4 conf
+    #   template:
+    #     src: update-exim4.conf.conf.j2
+    #     dest: /etc/exim4/update-exim4.conf.conf
+    #     owner: root
+    #     group: root
+    #     mode: 0644
 
-    - name: Set up exim4 password file
-      template:
-        src: passwd.client.j2
-        dest: /etc/exim4/passwd.client
-        owner: root
-        group: Debian-exim
-        mode: 0640
+    # - name: Set up exim4 password file
+    #   template:
+    #     src: passwd.client.j2
+    #     dest: /etc/exim4/passwd.client
+    #     owner: root
+    #     group: Debian-exim
+    #     mode: 0640
 
-    - name: Set up exim4 localmacros
-      copy:
-        src: exim4.conf.localmacros
-        dest: /etc/exim4/exim4.conf.localmacros
-        owner: root
-        group: root
-        mode: 0644
-      notify: restart exim4
+    # - name: Set up exim4 localmacros
+    #   copy:
+    #     src: exim4.conf.localmacros
+    #     dest: /etc/exim4/exim4.conf.localmacros
+    #     owner: root
+    #     group: root
+    #     mode: 0644
+    #   notify: restart exim4
 
-    - name: Set up FROM addresses
-      template:
-        src: email-addresses.j2
-        dest: /etc/email-addresses
-        owner: root
-        group: root
-        mode: 0644
-      notify: restart exim4
+    # - name: Set up FROM addresses
+    #   template:
+    #     src: email-addresses.j2
+    #     dest: /etc/email-addresses
+    #     owner: root
+    #     group: root
+    #     mode: 0644
+    #   notify: restart exim4
 
     - name: Make fail2ban work with ufw
       lineinfile:
diff --git a/roles/shell/templates/.zshrc.j2 b/roles/shell/templates/.zshrc.j2
index e6374e7..0d70261 100644
--- a/roles/shell/templates/.zshrc.j2
+++ b/roles/shell/templates/.zshrc.j2
@@ -174,7 +174,7 @@ export PATH="$PATH:$HOME/.local/bin"
 ################################################################
 # Pyenv
 export PATH="$HOME/.pyenv/bin:$PATH"
-eval "$(pyenv init -)"
+eval "$(pyenv init --path)"
 eval "$(pyenv virtualenv-init -)"
 
 # Pipx