Merge branch 'develop'

commands

@@ -1,8 +1,24 @@
-ansible-playbook -b test.yml --vault-password-file password --tags rust
+# Commands
-ansible-playbook -b test.yml --vault-password-file password --tags "setup,terraform"
 
-ansible-galaxy install -r requirements.yml
+## Playbook
 
-ansible-vault encrypt_string 'email-smtp.eu-west-1.amazonaws.com' --name 'vault_smtp_hostname' --vault-pass-file ./password
+### tags
 
-ansible-playbook playbook.yml --connection=local
+`ansible-playbook -b test.yml --vault-password-file password --tags rust`
+`ansible-playbook -b test.yml --vault-password-file password --tags "setup,terraform"`
+
+### run on Ubuntu in a venv
+
+`ansible-playbook -b provision.yml --vault-pass-file=password -e ansible_python_interpreter=/usr/bin/python`
+
+## Galaxy
+
+### install requirements
+
+`ansible-galaxy install -r requirements.yml`
+
+## Vault
+
+### Encrypt
+
+`ansible-vault encrypt_string 'email-smtp.eu-west-1.amazonaws.com' --name 'vault_smtp_hostname' --vault-pass-file ./password`

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

provision.yml

@@ -1,5 +1,6 @@
 ---
 - hosts: all
+# mac overrides
 # - hosts: 127.0.0.1
 #   connection: local
 

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

roles/setup/tasks/main.yml

@@ -71,39 +71,39 @@
         - restart ntp
         - restart cron
 
-    - name: Set up exim4 conf
+    # - name: Set up exim4 conf
-      template:
+    #   template:
-        src: update-exim4.conf.conf.j2
+    #     src: update-exim4.conf.conf.j2
-        dest: /etc/exim4/update-exim4.conf.conf
+    #     dest: /etc/exim4/update-exim4.conf.conf
-        owner: root
+    #     owner: root
-        group: root
+    #     group: root
-        mode: 0644
+    #     mode: 0644
 
-    - name: Set up exim4 password file
+    # - name: Set up exim4 password file
-      template:
+    #   template:
-        src: passwd.client.j2
+    #     src: passwd.client.j2
-        dest: /etc/exim4/passwd.client
+    #     dest: /etc/exim4/passwd.client
-        owner: root
+    #     owner: root
-        group: Debian-exim
+    #     group: Debian-exim
-        mode: 0640
+    #     mode: 0640
 
-    - name: Set up exim4 localmacros
+    # - name: Set up exim4 localmacros
-      copy:
+    #   copy:
-        src: exim4.conf.localmacros
+    #     src: exim4.conf.localmacros
-        dest: /etc/exim4/exim4.conf.localmacros
+    #     dest: /etc/exim4/exim4.conf.localmacros
-        owner: root
+    #     owner: root
-        group: root
+    #     group: root
-        mode: 0644
+    #     mode: 0644
-      notify: restart exim4
+    #   notify: restart exim4
 
-    - name: Set up FROM addresses
+    # - name: Set up FROM addresses
-      template:
+    #   template:
-        src: email-addresses.j2
+    #     src: email-addresses.j2
-        dest: /etc/email-addresses
+    #     dest: /etc/email-addresses
-        owner: root
+    #     owner: root
-        group: root
+    #     group: root
-        mode: 0644
+    #     mode: 0644
-      notify: restart exim4
+    #   notify: restart exim4
 
     - name: Make fail2ban work with ufw
       lineinfile:

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