diff options
-rw-r--r-- | ansible/exolobe1.yml | 21 | ||||
-rw-r--r-- | ansible/exolobe2.yml | 26 | ||||
-rw-r--r-- | ansible/group_vars/all.yml | 2 |
3 files changed, 24 insertions, 25 deletions
diff --git a/ansible/exolobe1.yml b/ansible/exolobe1.yml index 6734912..b3531d9 100644 --- a/ansible/exolobe1.yml +++ b/ansible/exolobe1.yml @@ -77,11 +77,9 @@ - qemu-user-static vars: - sane_debian_system_version: 2 - unix_users_version: 2 - ansible_python_interpreter: /usr/bin/python3 + sane_debian_system_version: 2 sane_debian_system_hostname: exolobe1 sane_debian_system_codename: bullseye sane_debian_system_timezone: Europe/Helsinki @@ -105,14 +103,7 @@ - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable main signing_key: "{{ ci_prod_signing_key }}" - mailname: exolobe1.liw.fi - - hostname: "{{ sane_debian_system_hostname }}" - relayhost: pieni.net:587 - smarthost: pieni.net - smarthost_user: pienirelay - smarthost_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}" - + unix_users_version: 2 unix_users: - username: liw comment: Lars Wirzenius @@ -122,3 +113,11 @@ - dialout authorized_keys: | {{ liw_personal_ssh_pub }} + + mailname: exolobe1.liw.fi + + hostname: "{{ sane_debian_system_hostname }}" + relayhost: pieni.net:587 + smarthost: pieni.net + smarthost_user: pienirelay + smarthost_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}" diff --git a/ansible/exolobe2.yml b/ansible/exolobe2.yml index eebc559..b86b8af 100644 --- a/ansible/exolobe2.yml +++ b/ansible/exolobe2.yml @@ -11,31 +11,31 @@ - storage_system - smarthost-client vars: - sane_debian_system_version: 2 - unix_users_version: 2 + ansible_python_interpreter: /usr/bin/python3 + sane_debian_system_version: 2 sane_debian_system_hostname: exolobe2 sane_debian_system_codename: buster + sane_debian_system_sources_lists: + - repo: | + deb http://security.debian.org/debian-security buster/updates main contrib non-free + + - repo: | + deb http://deb.debian.org/debian buster contrib non-free + + - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main + signing_key: "{{ ci_prod_signing_key }}" + unix_users_version: 2 unix_users: - username: liw comment: Lars Wirzenius sudo: yes authorized_keys: | - {{ liw_ssh_pub }} + {{ liw_personal_ssh_pub }} mailname: "{{ sane_debian_system_hostname }}.liw.fi" relayhost: pieni.net:587 smarthost: pieni.net smarthost_user: pienirelay smarthost_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}" - - sane_debian_system_sources_lists: - - repo: | - deb http://security.debian.org/debian-security buster/updates main contrib non-free - - - repo: | - deb http://deb.debian.org/debian buster contrib non-free - - - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main - signing_key: "{{ ci_prod_signing_key }}" diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index b3b079f..cfa2911 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -3,7 +3,7 @@ liw_ssh_pub: | liw_personal_ssh_pub: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50 + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPQe6lsTapAxiwhhEeE/ixuK+5N8esCsMWoekQqjtxjP liw personal systems dan_ssh_pub: | |