From 24d0ffd0877487c5ab9004977681a00f65e6ec7c Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Tue, 8 May 2018 21:31:12 +0200
Subject: [PATCH] Add initial user configuration

---
 .gitignore                        | 1 +
 ansible.cfg                       | 2 ++
 group_vars/all.yml                | 1 -
 roles/ubuntu_base/tasks/main.yml  | 4 ++--
 roles/ubuntu_base/tasks/users.yml | 9 +++------
 5 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 ansible.cfg

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e601699
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+playbook.retry
diff --git a/ansible.cfg b/ansible.cfg
new file mode 100644
index 0000000..aca582b
--- /dev/null
+++ b/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+remote_user = root
\ No newline at end of file
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 76e6bef..ef26587 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -5,5 +5,4 @@ users:
     key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbxFVukt5TIzoB0HX2q8b8lHJmXD1juzsWOu5XkexVDlCsvupa1cZ/OVkrIEAbDKk6RmJQj0TJ2O5+v9hbf0TDi0Pi+V8ADZIgO+OW5a4EeXsU72a4CN0nEocQhUPfQuC4IU+F7icoG2/I9jXg7U6p1LhBr8vlC3cNHnrH3yqrakrUR51/iRVIwo4FKvQg7jutaKTyOjlYa1uTdaczvAzNHWEdytCQgFnkzpR9fHvzkA79qHUD9n32rIpJicRJsHY3NnyDGfBcDv+4sLq15sM9jN83duGnSuMMtZgfSriwMUd/UwVReU2ZKxjMLe3WHB7+ZE/p39OJk/gjVfWJVh/za1/teTAwaLLmxh/HFt+AVYWkCj22fUxscl0dh2zy6Ki1Ua3ApChn6v6Gvng6khobFlxawSJZ49+0KoAl1qqFMR1o9EGWvqgDPuITAqJFN+ik0jxcxfmKrG3mbOYM1ikhJd0ER8wbS8e6NowHUBV7PUyDqxP5VM2gum58IYrDqaP2RYYi9vWWnXJJA8J1t+Wp3bF7fdktyVgkd7HQk02uVkxdMQQ802GCrQQuvJhWTCzrgkgrjPY8p0KcbCNt6jYQOUKV0T2vp6PbTJ5XWKb5u7gVXW1xiP9dYzgAr0DroiTK4xIuF80mv1Rfst0ceHAIQVcQ3GcGbh000QUYzbHT2Q== openpgp:0x265EE03C (Graffen)
     password: $6$6bgPWZ76LvB$DZ3ipFsFtL2b1nSC0AQ63k8ibJidyIE9iIsWWzY0fux0ynz9L/o7b2sR2XYSaDuG.jewFV36IGStTF3NCZRC30
     groups:
-      - docker
       - sudo
\ No newline at end of file
diff --git a/roles/ubuntu_base/tasks/main.yml b/roles/ubuntu_base/tasks/main.yml
index 4c23175..359e4f8 100644
--- a/roles/ubuntu_base/tasks/main.yml
+++ b/roles/ubuntu_base/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
-include_tasks: upgrade.yml
-include_tasks: users.yml
\ No newline at end of file
+- import_tasks: upgrade.yml
+- import_tasks: users.yml
\ No newline at end of file
diff --git a/roles/ubuntu_base/tasks/users.yml b/roles/ubuntu_base/tasks/users.yml
index c356f33..82a787d 100644
--- a/roles/ubuntu_base/tasks/users.yml
+++ b/roles/ubuntu_base/tasks/users.yml
@@ -1,18 +1,15 @@
 ---
-- name: "Add users (set password to 'changeme')"
+- name: "Add users"
   user:
     name: "{{ item.key }}"
     comment: "{{ item.value.comment }}"
-    password: "$1$gbSjoDr0$NgvOjcEBSzdK.WqjWGEfw0"
+    password: "{{ item.value.password }}"
     update_password: "on_create"
-    groups: 
-      - {{ item.groups }}
+    groups:  "{{ item.value.groups }}"
   with_dict: "{{ users | default({}) }}"
-  tags: usermanagement
 
 - name: "Add ssh authorized_keys"
   authorized_key:
     user: "{{ item.key }}"
     key: "{{ item.value.key }}"
   with_dict: "{{ users | default({}) }}"
-  tags: usermanagement