Change tabs, shorten bootstrapping

1 files changed, 24 insertions, 34 deletions

diff --git a/bootstrap.yml b/bootstrap.yml
index 6a00e93..022194e 100644
--- a/bootstrap.yml
+++ b/bootstrap.yml
@@ -1,36 +1,26 @@
 ---
-  - name: Bootstrap base systems
-    hosts: tamriel
-    remote_user: root
-    vars:
-      users:
-      - login: pawel
-        groups: ['sudo', 'remote_access', 'docker']
-        pubkey: "{{ lookup('file', '/home/pawel/.ssh/id_rsa.pub') }}"
-        shell: /bin/zsh
-      - login: ansible_worker
-        groups: ['sudo', 'remote_access', 'docker']
-        pubkey: "{{ lookup('file', '/home/pawel/.ssh/id_rsa.pub') }}"
-        shell: /bin/bash
-    roles:
-    - base_users
-    tasks:
-    - name: zsh
-      apt: 
-        name: zsh
-        update_cache: true
-    - name: Allow paswordless sudo
-      lineinfile:
-        dest: /etc/sudoers
-        state: present
-        insertafter: "^%sudo"
-        line: "ansible_worker\tALL=(ALL:ALL) NOPASSWD: ALL"
-        validate: '/usr/sbin/visudo -cf %s'
-    #    line: "%sudo ALL=(ALL) NOPASSWD: ALL"
-    - file:
-        path: /home/pawel/.zshrc
-        owner: pawel
-        group: pawel
-        state: touch
-        mode: 0660
+- name: Bootstrap base systems
+  hosts: tamriel
+  remote_user: root
+  vars:
+    users:
+    - login: pawel
+      groups: ['sudo', 'remote_access', 'docker']
+      pubkey: "{{ lookup('file', '/home/pawel/.ssh/id_rsa.pub') }}"
+      shell: /bin/bash
+    - login: ansible_worker
+      groups: ['sudo', 'remote_access', 'docker']
+      pubkey: "{{ lookup('file', '/home/pawel/.ssh/id_rsa.pub') }}"
+      shell: /bin/bash
+  roles:
+  - base_users
+  tasks:
+  - name: Allow paswordless sudo
+    lineinfile:
+      dest: /etc/sudoers
+      state: present
+      insertafter: "^%sudo"
+      line: "ansible_worker\tALL=(ALL:ALL) NOPASSWD: ALL"
+      validate: '/usr/sbin/visudo -cf %s'
+  #    line: "%sudo ALL=(ALL) NOPASSWD: ALL"