Merge branch 'add-marija' into 'main'

Add marija, allow multiple SSH keys per user See merge request !10

Merge branch 'add-marija' into 'main'
a6085228 · Karel van Klink · 8fe4b2c0 · f8a5e6b7 · a6085228 · a6085228
Commit a6085228 authored Apr 5, 2023 by Karel van Klink
--- a/roles/gap_utility_user/tasks/main.yml
+++ b/roles/gap_utility_user/tasks/main.yml
@@ -7,19 +7,21 @@

 - name: Add Linux users
  ansible.builtin.user:
-    name: "{{ item.username }}"
-    comment: "{{ item.full_name }}"
+    name: '{{ item.username }}'
+    comment: '{{ item.full_name }}'
    create_home: yes
    groups: sudo
    append: yes
    password: '!'      #  Do not allow login with a password
    password_lock: yes #  Login with SSH key only
-    shell: "{{ item.shell }}" 
+    shell: '{{ item.shell }}'
  register: user_output
-  with_items: "{{ goat_users }}"
+  with_items: '{{ goat_users }}'

 - name: Add SSH key to user for logging in
  ansible.posix.authorized_key:
-    user: "{{ item.username }}"
-    key: "{{ item.ssh_key }}"
-  with_items: "{{ goat_users }}"
+    user: '{{ item.0.username }}'
+    key: '{{ item.1 }}'
+  with_subelements:
+    - '{{ goat_users }}'
+    - ssh_keys
--- a/roles/gap_utility_user/vars/main.yaml
+++ b/roles/gap_utility_user/vars/main.yaml
@@ -2,36 +2,51 @@ goat_users:
  - username: simone
    full_name: "Simone Spinelli"
    shell: "/bin/bash"
-    ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDt0UfEy8Tz4lrrXvLqcmDcVB/uxGot3upZUOUtUFif6dBiGdasxvi7OaHoOh1Ho6SHGF57tXFYXzIR0VIXdFs0zG62FGESXLOzpGgoB/bWcRDoipcoM0rnMKNuL+SOFjGQ0XLQu4/I6UHd6pJ+JW2V6gx0KcbiHt5ogHiFeeDyC+p/+eSyP0kXVnP7ewU/A/0cTBhAEvNstPrWdKj4C9LadBq8ZC9JheuEBpJvG+EwEXTFfRwL3JsG1Gwvyhg2fmlqiqsiM70XB1v8CLOp/gGcv0ug1oAOl1XKEEYqE2z/GWvykX8DDyMF3C8JSdyX3oOANwYHQ46XuENZqKc4DvWt simonespinelli@GA0050" 
+    ssh_keys:
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDt0UfEy8Tz4lrrXvLqcmDcVB/uxGot3upZUOUtUFif6dBiGdasxvi7OaHoOh1Ho6SHGF57tXFYXzIR0VIXdFs0zG62FGESXLOzpGgoB/bWcRDoipcoM0rnMKNuL+SOFjGQ0XLQu4/I6UHd6pJ+JW2V6gx0KcbiHt5ogHiFeeDyC+p/+eSyP0kXVnP7ewU/A/0cTBhAEvNstPrWdKj4C9LadBq8ZC9JheuEBpJvG+EwEXTFfRwL3JsG1Gwvyhg2fmlqiqsiM70XB1v8CLOp/gGcv0ug1oAOl1XKEEYqE2z/GWvykX8DDyMF3C8JSdyX3oOANwYHQ46XuENZqKc4DvWt simonespinelli@GA0050"
  - username: karel
    full_name: "Karel van Klink"
    shell: "/bin/bash"
-    ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxC0VYk2OHmFHtnWb/J1dmEKwYmkKjhR6N9OsP0sjH+ KAREL'S TEST AND DEV KEY FOR BOGUS ENVIRONMENTS"
+    ssh_keys:
+      - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxC0VYk2OHmFHtnWb/J1dmEKwYmkKjhR6N9OsP0sjH+ KAREL'S TEST AND DEV KEY FOR BOGUS ENVIRONMENTS"
  - username: carolina
    full_name: "Carolina Fernandez"
    shell: "/bin/bash"
-    ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPm7bug6k5BX0vYNv4iTJk4U5JOFjFC4XwAcFY0b90mT7u6/7elTmwYniFmonPxxp/b+tkkNmQqjTKH2nofRhnVzdZe2ze4lPidSZ2zQQHejVcMMjFmClNby9JwtKwx25SaljU30NAnqOotLst8NTttBFy15buHXifRsiojpUV1O7n1LwDeCmEAauHF7HfInr4iEdZEEGwXr2bmnBvzkU7i0ikVcvpjBnKG1nVoSgOopozht/whvOSIEsRHaN/X585oq7sUI3D1yJN0RPMU5pbMvwUP6G+3MaVAQASviZyT11pQ01t6NPWu79OPIKmWXlfRj/2iXYtiABxxvQkOV/hBVPJVw7IgclneweuOk96xyVM1iNYjzydNDr9UJuTlI8R4AA2Br23dAPM4YRmyidiXGqAztDWFKOnthm8LDPG/EvW+QaYJ9btyS8UB6io8lfk4JXABJexmYPze0kdAIcTQIPQxk9imt9F0KiXD9AKxPgsikZpbya+5LJm1z/mBgVQJmxP9eDgceHzT6ErskkoeCH3apY7cYgmlv5vTpSji8roXey7sOuu43WrbvU1h03KkEQYm27TPt5quk+kXxV+krQ7CL1vLmvIkNwI0Q/DXHDRT4/mUJ9V0h7rAAy7HH/IeKRogETRu/qUcknBer//M4U/z4om/UaOQ+gt+YIN4Q== carolina@arachne"
+    ssh_keys:
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPm7bug6k5BX0vYNv4iTJk4U5JOFjFC4XwAcFY0b90mT7u6/7elTmwYniFmonPxxp/b+tkkNmQqjTKH2nofRhnVzdZe2ze4lPidSZ2zQQHejVcMMjFmClNby9JwtKwx25SaljU30NAnqOotLst8NTttBFy15buHXifRsiojpUV1O7n1LwDeCmEAauHF7HfInr4iEdZEEGwXr2bmnBvzkU7i0ikVcvpjBnKG1nVoSgOopozht/whvOSIEsRHaN/X585oq7sUI3D1yJN0RPMU5pbMvwUP6G+3MaVAQASviZyT11pQ01t6NPWu79OPIKmWXlfRj/2iXYtiABxxvQkOV/hBVPJVw7IgclneweuOk96xyVM1iNYjzydNDr9UJuTlI8R4AA2Br23dAPM4YRmyidiXGqAztDWFKOnthm8LDPG/EvW+QaYJ9btyS8UB6io8lfk4JXABJexmYPze0kdAIcTQIPQxk9imt9F0KiXD9AKxPgsikZpbya+5LJm1z/mBgVQJmxP9eDgceHzT6ErskkoeCH3apY7cYgmlv5vTpSji8roXey7sOuu43WrbvU1h03KkEQYm27TPt5quk+kXxV+krQ7CL1vLmvIkNwI0Q/DXHDRT4/mUJ9V0h7rAAy7HH/IeKRogETRu/qUcknBer//M4U/z4om/UaOQ+gt+YIN4Q== carolina@arachne"
  - username: sergio
    full_name: "Sergio Giménez"
    shell: "/bin/bash"
-    ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEjoAgZWflGDDY8ZZITYwDBg8EuPbVD5F2XBkAeMxyou sergio.gimenez@i2cat.net"
+    ssh_keys:
+      - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEjoAgZWflGDDY8ZZITYwDBg8EuPbVD5F2XBkAeMxyou sergio.gimenez@i2cat.net"
  - username: aleks
    full_name: "Aleksandr Kurbatov"
    shell: "/bin/bash"
-    ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDnqwHGz9R179s3omScJP0wRPhyt3w4HdKpkknjOwBn4VEurpgdu+mWxMvUDp11PniCh/ByzUx+SQ4PKExhYx7Qx720oKoTzQ/uOtvRHHjpN8GIlN2BC12NI3GdomWN5slrsU/6nEw3Of0sCS0vtBgxMo9dOumgFDDZSBRvy3sw+cFTlbEyl4rYhqs74ooGAKXp8udvFo2DUueMpNu+3r+g/RLOr3fc8EVY+mAKlu8p0Q5mnZM6V49FkHdOtGDOQ0Ox6K7/LbnMjfr4w+KCsCjTW1C/uXQ77wunCR8ADVbPYmfg/sooDIPrJFhYbPFkePN6X5EY1v+QpJr2n4tEn1oxCMXrBTSh0ZyR7HteFlU/4N8BGv6DFYshdOLlQf0MaX2qBjURttrZcgw0rU3A671qYh+k14Wk+jzAKzGcoV//NNVFwzefn2WYcXESZVx2LxhXed9ixS523SeAGLvUqwDGOJ5QrAtXBhQnDhr2C3u5z9o7E2ykOrXAHWxIxdlfky0= kurby@3fx51n2"
+    ssh_keys:
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDnqwHGz9R179s3omScJP0wRPhyt3w4HdKpkknjOwBn4VEurpgdu+mWxMvUDp11PniCh/ByzUx+SQ4PKExhYx7Qx720oKoTzQ/uOtvRHHjpN8GIlN2BC12NI3GdomWN5slrsU/6nEw3Of0sCS0vtBgxMo9dOumgFDDZSBRvy3sw+cFTlbEyl4rYhqs74ooGAKXp8udvFo2DUueMpNu+3r+g/RLOr3fc8EVY+mAKlu8p0Q5mnZM6V49FkHdOtGDOQ0Ox6K7/LbnMjfr4w+KCsCjTW1C/uXQ77wunCR8ADVbPYmfg/sooDIPrJFhYbPFkePN6X5EY1v+QpJr2n4tEn1oxCMXrBTSh0ZyR7HteFlU/4N8BGv6DFYshdOLlQf0MaX2qBjURttrZcgw0rU3A671qYh+k14Wk+jzAKzGcoV//NNVFwzefn2WYcXESZVx2LxhXed9ixS523SeAGLvUqwDGOJ5QrAtXBhQnDhr2C3u5z9o7E2ykOrXAHWxIxdlfky0= kurby@3fx51n2"
  - username: adrian
    full_name: "Adrian Pino"
    shell: "/bin/bash"
-    ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDanEIxk8EN9Bt2L/v7eFaCY9Xh+KYC8ej6sMuD8hRpC3NSpzsPfctEUua4OLK9aMtX9NMNdd7aeKXIUXXNvpouPnMSiGIl08vAIfQszbKTs+8kecJ4QAej0glGYMu6gYN1hwqBBklkZvBbbtbZ6Asb4L6/KbX/7rAUQuY/alAQC8KXof4IBuzGKMiUPao5m5REmVdKNyrEzFUFKAY0KvgUbYvyKWyyGBptro4dUwjZGV5WSmdZrJ6nJbWuH7CGSSvAxnqy5mfzd8kuBmIBONUXOLRQIm0cEg9speFK9yicfbfObwDwrncUwp/+63mU1c5RUzH7+CvHNWA+6fQX3y9Hx2fjjuiTN4WZVS3sqMbQEk5qQpvnapu3tIxCqJbA42jEprR/dwUI7NfjBq9BA9k3ni76oye/a7IaLi295D6rf2p1zksBfYRyOTkR8w2/6eQiOxWofWaHRMcbcL72WqlXPRLqXTCVVlf2pFM0ZKKBNDW2v/qccGuQzW9UPsDhw9KloPkX1bilD0JGwaXe7yN6SeASgkL/0eNCVIlgboaAQBkvN7BWzMgbe2o+V9pyzZ5dR/RtxLbfJVNShTsgkLNJ1CwkjXmaMbi19k7LgIV3JdCBMkPuCPB9+RxaNPODtjI0Fe0D9rh2EvuR09AZHehx2/wP7mrj3YnVLKXgpLoRhQ== adrian.pino@i2cat dell"
+    ssh_keys:
+    - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDanEIxk8EN9Bt2L/v7eFaCY9Xh+KYC8ej6sMuD8hRpC3NSpzsPfctEUua4OLK9aMtX9NMNdd7aeKXIUXXNvpouPnMSiGIl08vAIfQszbKTs+8kecJ4QAej0glGYMu6gYN1hwqBBklkZvBbbtbZ6Asb4L6/KbX/7rAUQuY/alAQC8KXof4IBuzGKMiUPao5m5REmVdKNyrEzFUFKAY0KvgUbYvyKWyyGBptro4dUwjZGV5WSmdZrJ6nJbWuH7CGSSvAxnqy5mfzd8kuBmIBONUXOLRQIm0cEg9speFK9yicfbfObwDwrncUwp/+63mU1c5RUzH7+CvHNWA+6fQX3y9Hx2fjjuiTN4WZVS3sqMbQEk5qQpvnapu3tIxCqJbA42jEprR/dwUI7NfjBq9BA9k3ni76oye/a7IaLi295D6rf2p1zksBfYRyOTkR8w2/6eQiOxWofWaHRMcbcL72WqlXPRLqXTCVVlf2pFM0ZKKBNDW2v/qccGuQzW9UPsDhw9KloPkX1bilD0JGwaXe7yN6SeASgkL/0eNCVIlgboaAQBkvN7BWzMgbe2o+V9pyzZ5dR/RtxLbfJVNShTsgkLNJ1CwkjXmaMbi19k7LgIV3JdCBMkPuCPB9+RxaNPODtjI0Fe0D9rh2EvuR09AZHehx2/wP7mrj3YnVLKXgpLoRhQ== adrian.pino@i2cat dell"
  - username: tvasilopo
    full_name: "Theodore Vasilopoulos"
    shell: "/bin/bash"
-    ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkGtvLC0DZP1ZVpnDlrJhVqAjjxXuQvO7oyc+Yy0xsGwi2MDvuTJr9NY6YfVpLInqEPyQYbPQIZUYdqGxdzc1V5G9B5ugKmWU86+p2F/5SgGnyUxsesiVaBK/CkM7LPWKwc8Y3a5gaLlbXsf1jFnQWq9c6gBI33gynHxmoRRkGiDS1edNOVyiXgJ0jePwhouxYhvQck9M6iIxEG0qtQWyW63sHaYWA+K1fxuTWj6E5A7nq0jnBdFHBnNvVgC8YACKRbf0QNQaEu9TKg1LCeNPAZZoJSGrNL/RXeYczooXv/KChonb0U659WBSWfgC9qdQ5/y89OgpghS1pKPbo7yYv tvasilopo@falcon"
+    ssh_keys:
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkGtvLC0DZP1ZVpnDlrJhVqAjjxXuQvO7oyc+Yy0xsGwi2MDvuTJr9NY6YfVpLInqEPyQYbPQIZUYdqGxdzc1V5G9B5ugKmWU86+p2F/5SgGnyUxsesiVaBK/CkM7LPWKwc8Y3a5gaLlbXsf1jFnQWq9c6gBI33gynHxmoRRkGiDS1edNOVyiXgJ0jePwhouxYhvQck9M6iIxEG0qtQWyW63sHaYWA+K1fxuTWj6E5A7nq0jnBdFHBnNvVgC8YACKRbf0QNQaEu9TKg1LCeNPAZZoJSGrNL/RXeYczooXv/KChonb0U659WBSWfgC9qdQ5/y89OgpghS1pKPbo7yYv tvasilopo@falcon"
  - username: tomeks
    full_name: "Tomek Szewczyk"
    shell: "/bin/bash"
-    ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICjhbrN6El4t23QpdwzBmFOKhauJXpehp4CtVGNGvlN1 tomeks@231-DISU-POTATO"
+    ssh_keys:
+      - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICjhbrN6El4t23QpdwzBmFOKhauJXpehp4CtVGNGvlN1 tomeks@231-DISU-POTATO"
  - username: jorge
    full_name: "Jorge Sasiain"
    shell: "/bin/bash"
-    ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+0UYMy8UggMCvmhl8Kjym8Cip3qoiIp1XDV3s09spBVxew/TBCA+C1/Dj9rveZdy7qh1uGlJBPXSJlSX2iChYgsFuBvcO7FIPUaAOFNggqTG/rZiiGSDQdnzbyrGA2zu/Z0R2KRYiplD7n1peaeXmrDxf0iltXuc48fIpbgFRhRpzwTBxaQacQ5Xq2O1jEP06uojQee5kY5yuKB5C/BFtIgn+XTT5v1FleQJWjQPekVk/yslZMvxuXSvDXsTpj5RCcEe7JIeXHlPcm2Nda8kMZcNffudFfjLZOhy5VBA4nUjaVVEMb4spehFWGyogh2o6msulQjoTY8r7YhPjOUH9NudBNRIgx0ebS7M262nol3V3sH0rplUZicTCUl1Tl7oX7czRcQV8bvOl9Q8XNWBo2dwHtYdB/UcXByV0qFMHQ5E+EUwaCSUXcBbFNwChCjmwyid5yv80GnP9WKTqglArU04744CN6Z1pKu9+P1cNnHYLiZGo/ToUoxACfiuzipU="
+    ssh_keys:
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+0UYMy8UggMCvmhl8Kjym8Cip3qoiIp1XDV3s09spBVxew/TBCA+C1/Dj9rveZdy7qh1uGlJBPXSJlSX2iChYgsFuBvcO7FIPUaAOFNggqTG/rZiiGSDQdnzbyrGA2zu/Z0R2KRYiplD7n1peaeXmrDxf0iltXuc48fIpbgFRhRpzwTBxaQacQ5Xq2O1jEP06uojQee5kY5yuKB5C/BFtIgn+XTT5v1FleQJWjQPekVk/yslZMvxuXSvDXsTpj5RCcEe7JIeXHlPcm2Nda8kMZcNffudFfjLZOhy5VBA4nUjaVVEMb4spehFWGyogh2o6msulQjoTY8r7YhPjOUH9NudBNRIgx0ebS7M262nol3V3sH0rplUZicTCUl1Tl7oX7czRcQV8bvOl9Q8XNWBo2dwHtYdB/UcXByV0qFMHQ5E+EUwaCSUXcBbFNwChCjmwyid5yv80GnP9WKTqglArU04744CN6Z1pKu9+P1cNnHYLiZGo/ToUoxACfiuzipU="
+  - username: marija
+    full_name: "Marija Emzo"
+    shell: "/bin/bash"
+    ssh_keys:
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCkb/JFcVoD7ghK9IXW2p7oXT313ZD8CSUv+/ZvULFy0LlQQNjEbJCGaYEcWbYYpEO667hjLfawoPKD4BoQ75wOBd49dsnNKkPh1x1sWqrlUx77JEx+61PNlsdyvhbzqjKC2KI2vbMNDhG8I7hq9DJ907ZdlTuNcbxmYGXwZgCNubKNT/HI1J+P22JTeSAy/W6urXxK3hMb6C2Usf069xoDybPv1ygYvBCBQ2diYp0uj3hmSX38r7DwuT5Vx+lG6eXfqPjVKhITmD2yYt/+Im22EH00zekYFco1tOf4z/Ni0Y2X0mwXDnWbIZE5W9sXp14gIQ86FNJ78atdIW3pNqe2nbC2TaVADjrc/mzk+WfZdneUgEWdjpznkrgupJx+Tnalr2d80jHouamvZvxvateJXbVLS/5NUk0xGMHwkGr+JcAD+DEoJ4CjtqdN0rqhSkiQJ7dPyhRB19ARw9PSiCheZgVCOsXWALxbeiCmo1QpXPTbh9/2nX1tUPYhu1AlNW8= mispi@mispi-ThinkPad-T570"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDL779Pz6XFFHWJgkJ5vmhHwjJVTI6Ov9sl8qhancwHZ1vtFBDRPU+m/mXOAPVFYsQo+ixcBuvY+KG7CBXouhOJPfmv5tpuJ26y7p/YTEScOGvkfGzyG9XcCupZt7yd9QBVeh0aS5zfObUQZmRNIOxbqFDHO13b5TOJrRQMzPdYMxRTkrG/2iwsgTdAeKse9EPKCfh4k6U5dHoZFvU2YJE+uuSxqaar3If1C70JON4Aq9/md6m99cKlq3ts7EkeJWuk1FpQo/eHsPm2L5fQXhxa+W3K3Kkva/HMr5dEabCbLRxcvsb/N1pKZvUZaSinUg87lQ2ZcaXn/OQjt6Y1HnCKSyNgRSe2EAIfcduZcL1vlqVmlDeMM8+eg7L8l9seX91mD1G01IDhsAnMF9DiIFjjiSleCARZxv9boIldHSfCC9R3ctsM/CFfJd8ssZdVj/Q2nuVeF7MLH4W+dKgtZPD2Sp7Pxh3k8iIR9HO4dg5FhZ1PYLjIOYSGYoMF07bgICE= mispi@Mispi-T15"