diff options
| -rw-r--r-- | ansible/debmirror.yml | 2 | ||||
| -rw-r--r-- | ansible/exolobe2.yml | 3 | ||||
| -rw-r--r-- | ansible/group_vars/ick-workers.yml | 2 | ||||
| -rw-r--r-- | ansible/group_vars/infinland.yml | 3 | ||||
| -rw-r--r-- | ansible/holywood.yml | 3 | ||||
| -rw-r--r-- | ansible/host_vars/debmirror.yml | 6 | ||||
| -rw-r--r-- | ansible/host_vars/e2obbench.yml | 7 | ||||
| -rw-r--r-- | ansible/host_vars/exolobe2.yml | 6 | ||||
| -rw-r--r-- | ansible/host_vars/holywood.yml | 6 | ||||
| -rw-r--r-- | ansible/host_vars/leonard.yml | 6 | ||||
| -rw-r--r-- | ansible/host_vars/willikins.yml | 6 | ||||
| -rw-r--r-- | ansible/ick.yml | 1 | ||||
| -rw-r--r-- | ansible/leonard.yml | 3 | ||||
| -rw-r--r-- | ansible/obbench.yml | 4 | ||||
| -rw-r--r-- | ansible/willikins.yml | 3 |
15 files changed, 24 insertions, 37 deletions
diff --git a/ansible/debmirror.yml b/ansible/debmirror.yml index 0bb201b..0857eea 100644 --- a/ansible/debmirror.yml +++ b/ansible/debmirror.yml @@ -5,7 +5,7 @@ - code.liw.fi-using-apt - sane-debian-system - version-controller - - users + - unix_users - postfix-null-client - debmirror - self-updating-system diff --git a/ansible/exolobe2.yml b/ansible/exolobe2.yml index 11b43b5..71b94a8 100644 --- a/ansible/exolobe2.yml +++ b/ansible/exolobe2.yml @@ -5,8 +5,7 @@ - sane-debian-system - liw-usual - version-controller - - users - - sshforwarder + - unix_users - vmhost - nfs-server-for-ick - self-updating-system diff --git a/ansible/group_vars/ick-workers.yml b/ansible/group_vars/ick-workers.yml index 21202ce..8203494 100644 --- a/ansible/group_vars/ick-workers.yml +++ b/ansible/group_vars/ick-workers.yml @@ -3,4 +3,4 @@ debian_mirror_src: null othermirror: http://code.liw.fi/debian pbuilder_ci_tgz: /var/cache/pbuilder/ci.tgz pbuilder_release_tgz: /var/cache/pbuilder/release.tgz -users: [] +unix_users: []
\ No newline at end of file diff --git a/ansible/group_vars/infinland.yml b/ansible/group_vars/infinland.yml index 96ecf3f..82313da 100644 --- a/ansible/group_vars/infinland.yml +++ b/ansible/group_vars/infinland.yml @@ -1,8 +1,5 @@ debian_mirror: http://ftp.fi.debian.org/debian debian_mirror_src: http://httpredir.debian.org/debian -sshforward_key: "{{ lookup('pipe', 'pass show sshforward/e2obbench') }}" -sshforward_key_pub: > - {{ lookup('pipe', 'pass show sshforward/e2obbench.pub') }} relayhost: pieni.net:587 smarthost: pieni.net smarthost_user: pienirelay diff --git a/ansible/holywood.yml b/ansible/holywood.yml index 51e29d6..ed96fb1 100644 --- a/ansible/holywood.yml +++ b/ansible/holywood.yml @@ -5,10 +5,9 @@ - sane-debian-system - liw-usual - version-controller - - users + - unix_users - nfs-server - web-server - - sshforwarder - holywood - self-updating-system vars: diff --git a/ansible/host_vars/debmirror.yml b/ansible/host_vars/debmirror.yml index fa60976..53dd17f 100644 --- a/ansible/host_vars/debmirror.yml +++ b/ansible/host_vars/debmirror.yml @@ -1,5 +1,5 @@ -codeliwfidistro: jessie mailname: debmirror.liw.fi -users: +authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys +unix_users: - username: liw - gecos: Lars Wirzenius + comment: Lars Wirzenius diff --git a/ansible/host_vars/e2obbench.yml b/ansible/host_vars/e2obbench.yml index 457c504..259b3d4 100644 --- a/ansible/host_vars/e2obbench.yml +++ b/ansible/host_vars/e2obbench.yml @@ -1,6 +1,5 @@ -sshforward_port: 22055 -users: +unix_users: - username: liw - gecos: Lars Wirzenius + comment: Lars Wirzenius - username: obbench - geocs: Obnam benchmark results + domment: Obnam benchmark results diff --git a/ansible/host_vars/exolobe2.yml b/ansible/host_vars/exolobe2.yml index fef027f..6cac452 100644 --- a/ansible/host_vars/exolobe2.yml +++ b/ansible/host_vars/exolobe2.yml @@ -1,4 +1,4 @@ -sshforward_port: 22044 -users: +authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys +unix_users: - username: liw - gecos: Lars Wirzenius + comment: Lars Wirzenius diff --git a/ansible/host_vars/holywood.yml b/ansible/host_vars/holywood.yml index 0fa3f70..6cac452 100644 --- a/ansible/host_vars/holywood.yml +++ b/ansible/host_vars/holywood.yml @@ -1,4 +1,4 @@ -sshforward_port: 22022 -users: +authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys +unix_users: - username: liw - gecos: Lars Wirzenius + comment: Lars Wirzenius diff --git a/ansible/host_vars/leonard.yml b/ansible/host_vars/leonard.yml index 31eab40..99783e6 100644 --- a/ansible/host_vars/leonard.yml +++ b/ansible/host_vars/leonard.yml @@ -1,6 +1,6 @@ codeliwfidistro: unstable mailname: leonard.liw.fi -sshforward_port: 22066 -users: +authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys +unix_users: - username: liw - gecos: Lars Wirzenius + comment: Lars Wirzenius diff --git a/ansible/host_vars/willikins.yml b/ansible/host_vars/willikins.yml index 9f4f6a6..6cac452 100644 --- a/ansible/host_vars/willikins.yml +++ b/ansible/host_vars/willikins.yml @@ -1,4 +1,4 @@ -sshforward_port: 22033 -users: +authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys +unix_users: - username: liw - gecos: Lars Wirzenius + comment: Lars Wirzenius diff --git a/ansible/ick.yml b/ansible/ick.yml index 3fadb41..190ad26 100644 --- a/ansible/ick.yml +++ b/ansible/ick.yml @@ -8,6 +8,5 @@ - python-dev-env - debian-dev-env - obnam-dev-env - - users - ick-worker - self-updating-system diff --git a/ansible/leonard.yml b/ansible/leonard.yml index cdd5c56..3a26371 100644 --- a/ansible/leonard.yml +++ b/ansible/leonard.yml @@ -16,6 +16,5 @@ - mail-client - docbuild - audio-handler - - users - - sshforwarder + - unix_users - self-updating-system diff --git a/ansible/obbench.yml b/ansible/obbench.yml index 889f4c5..f757e90 100644 --- a/ansible/obbench.yml +++ b/ansible/obbench.yml @@ -1,8 +1,6 @@ - hosts: e2obbench remote_user: ansible become: yes - vars: - users: [] roles: - code.liw.fi-using-apt - sane-debian-system @@ -11,7 +9,5 @@ - python-dev-env - debian-dev-env - obnam-dev-env - - users - - sshforwarder - obnam-benchmarker - self-updating-system diff --git a/ansible/willikins.yml b/ansible/willikins.yml index 7163364..32e675b 100644 --- a/ansible/willikins.yml +++ b/ansible/willikins.yml @@ -6,6 +6,5 @@ - sane-debian-system - liw-usual - version-controller - - users - - sshforwarder + - unix_users - self-updating-system |