diff options
| -rw-r--r-- | dan/group_vars/all.yml | 12 | ||||
| -rw-r--r-- | inventory/group_vars/all/main.yml | 2 | ||||
| -rw-r--r-- | roles/admin-user/tasks/main.yml | 6 |
3 files changed, 18 insertions, 2 deletions
diff --git a/dan/group_vars/all.yml b/dan/group_vars/all.yml new file mode 100644 index 00000000..4fed6291 --- /dev/null +++ b/dan/group_vars/all.yml @@ -0,0 +1,12 @@ +$ANSIBLE_VAULT;1.2;AES256;dan +35373930356362396230303930336532323636636535666632393862613764333634633230363665 +3138643462393861346262303064643063643064633838300a376537626364313538376237633032 +62366664333964653939353931393264366630653335306464653337643364336338383830626439 +6363343166393034310a623466396335646536383431313437363133356137303965613132613538 +61353866393032643233383539656266336239666461626134333666346235383830613963306639 +31646263333062303132653661303932353236346431646665626566383466383438373264363537 +66613466626435623933333663313033376134313339636139383566333234373939636532663437 +66663830316362363836383432316236633336393738633833373062356532626633616639323731 +32313938633238373234653238373137393236316664623634396238633365363662303964373130 +63323864383733303438356534663932616137306165373233323566636238613338623930383533 +656232353731303865303864343535663439 diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml index 82d81d6e..898ecab7 100644 --- a/inventory/group_vars/all/main.yml +++ b/inventory/group_vars/all/main.yml @@ -10,7 +10,7 @@ ssh_keys_root: "{{ ssh_keys.equinox[env_group] }}" equinox_user: name: equinox - # password: "{{ vault_equinox_password }}" + password: "{{ vault_equinox_password }}" shell: /bin/zsh ssh_keys: "{{ ssh_keys.equinox[env_group] }}" diff --git a/roles/admin-user/tasks/main.yml b/roles/admin-user/tasks/main.yml index 887da0ab..5933863d 100644 --- a/roles/admin-user/tasks/main.yml +++ b/roles/admin-user/tasks/main.yml @@ -9,12 +9,14 @@ user: name: "{{ item.name }}" state: present - password: "{{ item.password | default(omit) }}" + password: "{{ item.password }}" groups: - sudo - adm append: yes shell: "{{ item.shell | default(omit) }}" + loop_control: + label: "{{ item.name }}" - name: install ssh keys for admin users with_items: "{{ admin_user_group | default([]) | union(admin_user_host | default([])) }}" @@ -22,3 +24,5 @@ user: "{{ item.name }}" key: "{{ item.ssh_keys | join('\n') }}" exclusive: yes + loop_control: + label: "{{ item.name }}" |