'users.yml' updaten

.gitignore

@@ -1,13 +1,3 @@
+secrets.yml
 *.retry
 *.pyc
-.vault_pass.txt
-# ---> Vim
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-*.un~
-Session.vim
-.netrwhist
-*~
-*.swp
-.vault_pass.txt
-promtools/results

README.md

@@ -1,6 +1,4 @@
-# HPC playbooks
-
-This repository has been moved to [github](https://github.com/rug-cit-hpc/HPCplaybooks)
+# ssh keys repository
 
 The `users.yml` playbook contains users and public keys.
 The playbook uses `/etc/hosts` as a database for hosts to install the keys on.

ansible.cfg

@@ -1,4 +1,2 @@
 [defaults]
-inventory = hosts.py
-stdout_callback = debug
-vault_password_file = .vault_pass.txt
+hostfile = hosts.py

cadvisor.yml

@@ -1,5 +0,0 @@
----
-- hosts: all
-  become: True
-  roles:
-     - cadvisor

meta/main.yml

@@ -1 +0,0 @@
----

nginx_proxy.yml

@@ -1,6 +0,0 @@
----
-- hosts: all
-  become: True
-  roles:
-     - docker
-     - nginx-proxy

node-exporter.yml

@@ -1,5 +0,0 @@
----
-- hosts: all
-  become: True
-  roles:
-     - cadvisor

node_exporter.yml

@@ -1,5 +0,0 @@
----
-- hosts: all
-  become: True
-  roles:
-     - node_exporter

prometheus.yml

@@ -1,5 +0,0 @@
----
-- hosts: all
-  become: True
-  roles:
-     - prom_server

promtools/Dockerfile

@@ -1,22 +0,0 @@
-FROM golang:1.11-stretch
-
-MAINTAINER Egon Rijpkema <e.m.a.rijpkema@rug.nl>
-
-RUN mkdir /results
-
-RUN go get github.com/prometheus/node_exporter && \
-    cd ${GOPATH-$HOME/go}/src/github.com/prometheus/node_exporter && \
-    make && \
-    cp node_exporter /results
-
-RUN go get github.com/robustperception/pushprox/proxy && \
-    cd ${GOPATH-$HOME/go}/src/github.com/robustperception/pushprox/proxy && \
-    go build && \
-    cp /go/bin/proxy /results
-
-RUN go get github.com/robustperception/pushprox/client && \
-    cd ${GOPATH-$HOME/go}/src/github.com/robustperception/pushprox/client && \
-    go build && \
-    cp /go/bin/client /results
-
-CMD /go/bin/proxy

promtools/addport.py

@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-'''
-Pushprox:  does not include the port number in its targets json
-on the /clients endpoint. while Prometheus does seem to need it.
-
-for more info see: https://github.com/RobustPerception/PushProx
-'''
-
-import json
-from urllib import request
-
-url = 'http://knyft.hpc.rug.nl:6060/clients'
-outfile = 'targets.json'
-
-data = json.loads(request.urlopen(url).read().decode('utf-8'))
-
-targets = []
-
-for node in data:
-    for target in node['targets']:
-        if target[-5:] != '9100':
-            target = '{}:9100'.format(target)
-            targets.append(target)
-
-with open(outfile, 'w') as handle:
-    handle.write(json.dumps(
-        [{
-        "targets" : targets,
-        "labels": {
-            "env": "peregrine",
-            "job": "node"
-            }
-        }]
-        ,indent=4 ))

promtools/build.sh

@@ -1,6 +0,0 @@
-#!/bin/bash -ex
-
-mkdir -p results
-docker build . -t promtools
-docker run -d --name promtools --rm promtools sleep 3
-docker cp promtools:/results .

roles/cadvisor/tasks/main.yml

@@ -1,25 +0,0 @@
----
-- name: Install service files.
-  template:
-    src: templates/cadvisor.service
-    dest: /etc/systemd/system/cadvisor.service
-    mode: 644
-    owner: root
-    group: root
-  tags:
-      - service-files
-
-- name: install service files
-  command: systemctl daemon-reload
-
-- name: enable service at boot
-  systemd:
-    name: cadvisor
-    enabled: yes
-
-- name: make sure servcies are started.
-  systemd:
-    name: cadvisor.service
-    state: restarted
-  tags:
-      - start-service

roles/cadvisor/templates/cadvisor.service

@@ -1,22 +0,0 @@
-[Unit]
-Description=Prometheus container monitoring.
-After=docker.service
-Requires=docker.service
-
-[Service]
-TimeoutStartSec=0
-Restart=always
-ExecStartPre=-/usr/bin/docker kill %n
-ExecStartPre=-/usr/bin/docker rm %n
-ExecStart=/usr/bin/docker run --name %n \
-    --volume=/:/rootfs:ro \
-    --volume=/var/run:/var/run:rw \
-    --volume=/sys:/sys:ro \
-    --volume=/var/lib/docker/:/var/lib/docker:ro \
-    --volume=/dev/disk/:/dev/disk:ro \
-    --publish=8181:8080 \
-    google/cadvisor:latest
-
-
-[Install]
-WantedBy=multi-user.target

roles/docker/files/daemon.json

@@ -1,7 +0,0 @@
-{
-  "log-driver": "json-file",
-  "log-opts": {
-    "max-size": "10m",
-    "max-file": "10"
-  }
-}

roles/docker/tasks/main.yml

@@ -1,31 +0,0 @@
----
-# Install Docker. Centos needs te be added.
-
-- apt_key:
-    id: 58118E89F3A912897C070ADBF76221572C52609D
-    keyserver: hkp://p80.pool.sks-keyservers.net:80
-    state: present
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial'
-
-- apt_repository:
-    repo: deb https://apt.dockerproject.org/repo ubuntu-xenial main
-    update_cache: yes
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial'
-
-- name: install docker
-  apt: pkg={{ item }} state=latest
-  with_items:
-    - docker-engine
-    - python-docker
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial'
-
-- name: Setup log rotation.
-  copy:
-    src: files/daemon.json
-    dest: /etc/docker/daemon.json
-  tags: ['settings']
-
-- name: make sure service is started
-  systemd:
-    name: docker.service
-    state: started

roles/nginx-proxy/tasks/main.yml

@@ -1,20 +0,0 @@
-# Install a nginx reverse proxy with a systemd unit file.
-# See https://github.com/jwilder/nginx-proxy
----
-- name: install service file.
-  template:
-    src: templates/nginx-proxy.service
-    dest: /etc/systemd/system/nginx-proxy.service
-    mode: 644
-    owner: root
-    group: root
-
-- command: systemctl daemon-reload
-
-- name: start service at boot.
-  command: systemctl reenable nginx-proxy.service
-
-- name: make sure service is started
-  systemd:
-    name: nginx-proxy.service
-    state: restarted

roles/nginx-proxy/templates/nginx-proxy.service

@@ -1,16 +0,0 @@
-[Unit]
-Description=nginx reverse proxy for docker containers.
-After=docker.service
-Requires=docker.service
-
-[Service]
-TimeoutStartSec=0
-Restart=always
-ExecStartPre=-/usr/bin/docker kill %n
-ExecStartPre=-/usr/bin/docker rm %n
-ExecStart=/usr/bin/docker run --name %n \
-    --rm -d -p 80:80 -p 443:443 -v /srv/certs:/etc/nginx/certs \
-    -v /var/run/docker.sock:/tmp/docker.sock:ro jwilder/nginx-proxy
-
-[Install]
-WantedBy=multi-user.target

roles/node_exporter/tasks/main.yml

@@ -1,36 +0,0 @@
----
-- file:
-    path: /usr/local/prometheus
-    state: directory
-    mode: 0755
-
-- name: Install node exporter
-  copy:
-    src: "{{ playbook_dir }}/promtools/results/node_exporter"
-    dest: /usr/local/prometheus/node_exporter
-    mode: 0755
-
-- name: Install service files.
-  template:
-    src: templates/node-exporter.service
-    dest: /etc/systemd/system/node-exporter.service
-    mode: 644
-    owner: root
-    group: root
-  tags:
-      - service-files
-
-- name: install service files
-  command: systemctl daemon-reload
-
-- name: enable service at boot
-  systemd:
-    name: node-exporter
-    enabled: yes
-
-- name: make sure servcies are started.
-  systemd:
-    name: node-exporter.service
-    state: restarted
-  tags:
-      - start-service

roles/node_exporter/templates/node-exporter.service

@@ -1,16 +0,0 @@
-[Unit]
-Description=prometheus node exporter
-
-[Service]
-TimeoutStartSec=0
-Restart=always
-ExecStart=/usr/local/prometheus/node_exporter \
- --collector.filesystem.ignored-mount-points "^/(sys|proc|dev|host|etc)($|/)" \
-{% if 'login' in role_names %}
-    --collector.filesystem.ignored-fs-types="^(sys|proc|auto|cgroup|devpts|ns|au|fuse\.lxc|mqueue|overlay)(fs|)$$"
-{% else %}
-    --collector.filesystem.ignored-fs-types="^(sys|proc|auto|cgroup|devpts|ns|au|fuse\.lxc|mqueue|overlay|lustre)(fs|)$$"
-{% endif %}
-
-[Install]
-WantedBy=multi-user.target

roles/prom_server/tasks/main.yml

@@ -1,64 +0,0 @@
----
-- include_vars: vars/secrets.yml
-
-- file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0777
-  with_items:
-    - /srv/prometheus/etc/prometheus
-    - /srv/prometheus/prometheus
-
-- name: Install prometheus.yml
-  template:
-    src: templates/etc/{{ item }}
-    dest: /srv/prometheus/etc/prometheus/{{ item }}
-    mode: 644
-    owner: root
-    group: root
-  with_items:
-    - prometheus.yml
-
-- name: Install other settings files.
-  copy:
-    src: templates/etc/{{ item }}
-    dest: /srv/prometheus/etc/prometheus/{{ item }}
-    mode: 644
-    owner: root
-    group: root
-  with_items:
-    - alerting.rules
-    - targets.json
-
-- name: Install nsswitch see https://github.com/jumanjiman/docker-ssllabs-scan/blob/6d9f48c9ac4f1df3eebef3ab28e2dd44a9ba4998/scanner/etc/nsswitch.conf
-  copy:
-    src: templates/etc/nsswitch.conf
-    dest: /srv/prometheus/etc/nsswitch.conf
-    mode: 644
-    owner: root
-    group: root
-
-- name: Install service files.
-  template:
-    src: templates/prometheus.service
-    dest: /etc/systemd/system/prometheus.service
-    mode: 644
-    owner: root
-    group: root
-  tags:
-    - service-files
-
-- name: install service files
-  command: systemctl daemon-reload
-
-- name: enable service at boot
-  systemd:
-    name: prometheus.service
-    enabled: yes
-
-- name: make sure servcies are started.
-  systemd:
-    name: prometheus.service
-    state: restarted
-  tags:
-    - start-service

roles/prom_server/templates/etc/alerting.rules

@@ -1,71 +0,0 @@
-groups:
-- name: basic
-  rules:
-  - alert: InstanceDown
-    expr: up{job="node"} == 0
-    for: 10m
-    labels:
-      severity: page
-    annotations:
-      description: '{{ $labels.instance }} of job {{ $labels.job }} has been down
-        for more than 10 minutes.'
-      summary: Instance {{ $labels.instance }} down
-  - alert: Time not being synced
-    expr: node_timex_sync_status{job="node"} == 0
-    for: 5m
-    labels:
-      severity: page
-    annotations:
-      description: '{{ $labels.instance }} is not configured to sync its time with an external ntp server'
-      summary: Instance {{ $labels.instance }} no ntp configured.
-  - alert: clock wrong
-    expr: node_timex_offset_seconds{job="node"} > 1
-    for: 10m
-    labels:
-      severity: page
-    annotations:
-      description: '{{ $labels.instance }} has a clock offset > 1 second.'
-      summary: '{{ $labels.instance }} has clock drift.'
-  - alert: DiskWillFillIn8Hours
-    expr: predict_linear(node_filesystem_free{job="node",mountpoint!~"/tmp|/local|/target/gpfs3"}[2h], 8 * 3600) < 0
-    for: 2h
-    labels:
-      severity: page
-    annotations:
-      description: Instance {{ $labels.instance }} will fill up within 8 hours
-      summary: '{{ $labels.instance }} disk full'
-  - alert: DiskWillFillIn72Hours
-    expr: predict_linear(node_filesystem_free{job="node",mountpoint!~"/tmp|/local|/target/gpfs3"}[6h], 72 * 3600) < 0
-    for: 8h
-    labels:
-      severity: page
-    annotations:
-      description: Instance {{ $labels.instance }} will fill up within 72 hours
-      summary: '{{ $labels.instance }} disk almost full'
-  - alert: DiskFull
-    expr: node_filesystem_free{job="node",mountpoint!~"/tmp|/net|/cvmfs|/var/lib/nfs/rpc_pipefs|/cvmfs|/misc|/run/docker/netns/.+?|/cgroup.+?", fstype!~"fuse.+?"} < 5.24288e+06
-    for: 5m
-    labels:
-      severity: page
-    annotations:
-      description: Instance {{ $labels.instance }} has a full {{ $labels.mountpoint }}.
-      summary: '{{ $labels.instance }} Disk full'
-  - alert: tmpFull
-    expr: node_filesystem_free{job="node",mountpoint="/tmp"} < 5242880
-    for: 30m
-    labels:
-      severity: page
-    annotations:
-      description: Instance {{ $labels.instance }} Has a full /tmp
-      summary: '{{ $labels.instance }} /tmp full'
-  - alert: NodeRebooted
-    expr: delta(node_boot_time[1h]) > 10
-    for: 1m
-    labels:
-      severity: page
-    annotations:
-      description: Instance {{ $labels.instance }} has been rebooted.
-      summary: '{{ $labels.instance }} rebooted'
-#  - alert: TestAlert
-#    expr: probe_success{instance="195.169.22.220:11211",job="blackbox"} == 0
-#    for: 1m

roles/prom_server/templates/etc/nsswitch.conf

@@ -1,3 +0,0 @@
-# https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275
-# https://golang.org/pkg/net/
-hosts: files dns

roles/prom_server/templates/etc/prometheus.yml

@@ -1,55 +0,0 @@
-# my global config
-global:
-  scrape_interval:     60s # By default, scrape targets every 15 seconds.
-  evaluation_interval: 60s # By default, scrape targets every 15 seconds.
-  # scrape_timeout is set to the global default (10s).
-
-  # Attach these labels to any time series or alerts when communicating with
-  # external systems (federation, remote storage, Alertmanager).
-  external_labels:
-      monitor: {{ ansible_hostname }}
-
-# alert
-alerting:
-  alertmanagers:
-  - scheme: http
-    static_configs:
-    - targets:
-      - "alertmanager.kube.hpc.rug.nl"
-    basic_auth:
-       username: hpc
-       password: {{ alertmanager_pass }}
-
-# Load and evaluate rules in this file every 'evaluation_interval' seconds.
-rule_files:
-- '/etc/prometheus/alerting.rules'
-
-# A scrape configuration containing exactly one endpoint to scrape:
-# Here it's Prometheus itself.
-scrape_configs:
-  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-  - job_name: 'prometheus'
-    static_configs:
-         - targets: ['localhost:9090']
-
-  # peregrine
-  - job_name: 'node'
-    scrape_interval: 120s
-    file_sd_configs:
-        - files:
-          - targets.json
-
-  # peregrine
-  - job_name: 'ipmi'
-    scrape_interval: 120s
-    file_sd_configs:
-        - files:
-          - ipmi-targets.json
-
-
-  # Scrape the cadvisor container exporter
-  - job_name: 'cadvisor'
-    scrape_interval: 60s
-    file_sd_configs:
-        - files:
-          - cadvisor.json

roles/prom_server/templates/etc/targets.json

@@ -1,10 +0,0 @@
-[
-    {
-        "targets": [
-        ],
-        "labels": {
-            "env": "blank",
-            "job": "node"
-        }
-    }
-]

roles/prom_server/templates/prometheus.service

@@ -1,20 +0,0 @@
-[Unit]
-Description=Prometheus monitoring
-After=docker.service
-Requires=docker.service
-
-[Service]
-TimeoutStartSec=0
-Restart=always
-ExecStartPre=-/usr/bin/docker kill %n
-ExecStartPre=-/usr/bin/docker rm %n
-ExecStart=/usr/bin/docker run --name %n \
-    --network host \
-    -v /srv/prometheus/prometheus:/prometheus  \
-    -v /srv/prometheus/etc/nsswitch.conf/etc/nsswitch.conf  \
-    -v /srv/prometheus/etc/prometheus:/etc/prometheus  \
-    prom/prometheus:v2.6.0 \
-    --storage.tsdb.retention 365d --config.file=/etc/prometheus/prometheus.yml \
-    --storage.tsdb.path=/prometheus --web.enable-lifecycle
-[Install]
-WantedBy=multi-user.target

roles/prom_server/vars/secrets.yml

@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35653034666233356434653337323037616464346462626436613836626633653661613162393235
-3731313333396465616430306530653430353730636662350a326134643635636364363566313933
-38303164616631316265393330343566383232333337386661643534356263323137616362393662
-3636366636613934660a366631616666366331326331623261396435656533313563666464396439
-38663533386634323933646166306666626533623730613363396639633638393864396264313836
-39343132653439376361353462626332336134626661656236366636623932363638656530313966
-616665383932306236346236633636623561

roles/stealth/tasks/main.yml

@@ -1,16 +0,0 @@
----
-
-- user:
-    name: kees
-    comment: "Kees Visser"
-    group: admin
-
-- authorized_key:
-    user: kees
-    key: 'ssh-dss AAAAB3NzaC1kc3MAAACBALg7GbHKk2jYPNXUgW69AKKnCALjroTtwCA0bt4zde1mavYNoQK8JY/pe4BSOQtsyo3JECYzmAZwoNbq8nJCh8ORf5tKs8njEykZ0n7BVWtCT/jh9EFPTFhFK864TdFVCvwtIafAL4kEVNvJ0wrJYa1mN/ds03HWliv+3Shj6x0dAAAAFQDxlwgId3zlrXiCfk3ciAHN5b2ScwAAAIEArZ3/Hg7FECh5Fjf7lnBQZW7sjG5OLZRJIZlj2/jYnvIRUrsN2XmebwO4Q5q7g7FLWlfbg+x2Lmv1OWf/zGd3U6aAx8M+d+nTWDtWpQNvcE99HlfOs9Q4Rzxx6ZOyaZn57lCva/nCmLe0DTPVB8rvocMmqe1r3n7/KgxxKttbWRUAAACAfH2y4JPt2AcVdHnHiibpQBtxK/9m6AEjsB/g02tMXHZletMs9jF6kGynan7xJqRqvWxkGS1ClHIUdt2uK6A6pbqOf2BwcBIxAdljLRrZOyvmW9KTqduHMemYv6xQnpNGb8moWq5V5FKiATvd/LB46O1zwZejJErfj70LRE98Hv4= stealth@operator'
-    state: present
-
-- name: unpack stealth tarrball.
-  unarchive:
-    src: files/stealth-linux.tar
-    dest: /home/kees

security.yml

@@ -1,16 +0,0 @@
----
-- name: Install roles needed for exposed hosts
-  hosts: all
-  become: true
-  roles:
-     - geerlingguy.repo-epel
-     - geerlingguy.security
-  tasks:
-     - cron:
-          name: Reboot to load new kernel.
-          weekday: 1
-          minute: 45
-          hour: 11
-          user: root
-          job: /bin/needs-restarting -r >/dev/null 2>&1 || /sbin/shutdown -r +60 "restarting to apply updates"
-          cron_file: reboot

stealth.yml

@@ -1,5 +0,0 @@
----
-- hosts: all
-  become: True
-  roles:
-     - stealth

users.yml

@@ -21,12 +21,8 @@
 
     - authorized_key:
         user: wim
-        key: '{{ item }}'
+        key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPcJbucOFOFrPZwM1DKOvscYpDGYXKsgeh3/6skmZn/IhLWYHY6oanm4ifmY3kU0oNXpKgHR43x3JdkIRKmrEpYULspwdlj/ZKPYxFWhVaSTjJvmSJEgy7ET1xk+eVoKV1xRWm/BugWpbseFAOcI9ZwfH++S8JhfX6GgCIy06RUpM8EcFAWb/GO699ZnQ67qMxNdSWYHtK1zu+9svWgEzPk4zc2TihJsc7DxcfQCNfQ4vKH1Im3+QfG5bRtdyVl9yjbE+o4EWhPEWsTBgBosJfbqfywsuzibhTgyybR0Zzm4JN6Wh5wVazvNutAB291dIJt22XEx5tCyOAjLPybLy3 wim@wim-HP-Compaq-Elite-8300-MT'
         state: present
-      with_items:
-          - 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAilJDjQ8CIdM+5w0Q9ORXheq+hYgfPbcpJ1BoWvMxZrz2ahbamWEeLanWeGcHeQ6rEqTIXv7B3i7erkPHFo+vWUt4b/e1N1OEpuJMueGAn2cDiWbTI9KU+yNCMO8UF6wK8LWqLkUBLm0lpnylwYJDW0NCoVkANU2NJ0JkdzT/bpuAWJp3rs4H7na/EV5vZT/gllMihtIBwWfJNh1BF048PhUBs+l0MSRG8rYe2YcUF66h8btghzYsSqiETGnroVW0XKOHKjxVWO2z2+OkcHOc19zSK6EQMe0+TZFp8Jg3jPZ+4wWnmBv+Zgxg4eEQ8FvfHS7/5lnGF6YATV2cG6Nh9w== rsa-key-20180502'
-          - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPcJbucOFOFrPZwM1DKOvscYpDGYXKsgeh3/6skmZn/IhLWYHY6oanm4ifmY3kU0oNXpKgHR43x3JdkIRKmrEpYULspwdlj/ZKPYxFWhVaSTjJvmSJEgy7ET1xk+eVoKV1xRWm/BugWpbseFAOcI9ZwfH++S8JhfX6GgCIy06RUpM8EcFAWb/GO699ZnQ67qMxNdSWYHtK1zu+9svWgEzPk4zc2TihJsc7DxcfQCNfQ4vKH1Im3+QfG5bRtdyVl9yjbE+o4EWhPEWsTBgBosJfbqfywsuzibhTgyybR0Zzm4JN6Wh5wVazvNutAB291dIJt22XEx5tCyOAjLPybLy3 wim@wim-HP-Compaq-Elite-8300-MT'
-
 
     - user:
         name: egon
@@ -48,18 +44,12 @@
 
     - authorized_key:
         user: hopko
-        key: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArQsJ0g/a5YOHlk7xcMpHNxiN+up4syzLZfgiICECET/SCDXUN4Xh3BlSWng8hMQMD5sNSADF4AghdLKfuqXG1MMSvzGSVTcRwiZ+Hq6YCoiinpQw0qu7LOZVZeoG8f7sGwhBqe0wKeyPe6Q7nRe0CXvM+aU4XfZz18O/d3mU1S7cEiue02MgH6ff6VTJFqOtLGpL1rILJn3t58N+2CCWxJwGplkp7hRJ9TnhQqCO+PN/p/4neusjembRu5lX+AKX1mv91WYURkxfLE3CWe9V9YJVG0lLgfXDMyghqkTwf8UsMHS5FBy8oTvuC55EhX+xm2Peo1lZlzy7t5Hg2fWYFQ== h.meijering@rug.nl'
-        state: present
-
-    - user:
-        name: kees
-        comment: "Kees Visser"
-        group: admin
-
-    - authorized_key:
-        user: kees
-        key: 'ssh-dss AAAAB3NzaC1kc3MAAACBALg7GbHKk2jYPNXUgW69AKKnCALjroTtwCA0bt4zde1mavYNoQK8JY/pe4BSOQtsyo3JECYzmAZwoNbq8nJCh8ORf5tKs8njEykZ0n7BVWtCT/jh9EFPTFhFK864TdFVCvwtIafAL4kEVNvJ0wrJYa1mN/ds03HWliv+3Shj6x0dAAAAFQDxlwgId3zlrXiCfk3ciAHN5b2ScwAAAIEArZ3/Hg7FECh5Fjf7lnBQZW7sjG5OLZRJIZlj2/jYnvIRUrsN2XmebwO4Q5q7g7FLWlfbg+x2Lmv1OWf/zGd3U6aAx8M+d+nTWDtWpQNvcE99HlfOs9Q4Rzxx6ZOyaZn57lCva/nCmLe0DTPVB8rvocMmqe1r3n7/KgxxKttbWRUAAACAfH2y4JPt2AcVdHnHiibpQBtxK/9m6AEjsB/g02tMXHZletMs9jF6kGynan7xJqRqvWxkGS1ClHIUdt2uK6A6pbqOf2BwcBIxAdljLRrZOyvmW9KTqduHMemYv6xQnpNGb8moWq5V5FKiATvd/LB46O1zwZejJErfj70LRE98Hv4= stealth@operator'
+        key: '{{ item }}'
         state: present
+      with_items:
+          - 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArQsJ0g/a5YOHlk7xcMpHNxiN+up4syzLZfgiICECET/SCDXUN4Xh3BlSWng8hMQMD5sNSADF4AghdLKfuqXG1MMSvzGSVTcRwiZ+Hq6YCoiinpQw0qu7LOZVZeoG8f7sGwhBqe0wKeyPe6Q7nRe0CXvM+aU4XfZz18O/d3mU1S7cEiue02MgH6ff6VTJFqOtLGpL1rILJn3t58N+2CCWxJwGplkp7hRJ9TnhQqCO+PN/p/4neusjembRu5lX+AKX1mv91WYURkxfLE3CWe9V9YJVG0lLgfXDMyghqkTwf8UsMHS5FBy8oTvuC55EhX+xm2Peo1lZlzy7t5Hg2fWYFQ== h.meijering@rug.nl'
+          - 'ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAAwpze6sLHej0ICj4nT0iM+Dn0A+Yy2h4PqOmLylxGBuhrIhYNOpze/J4RA20ktSSJEXuHCHG23DMzcyqrLCYKbAGPsAd8e/PCXg9DfeBBteOOOI27Aad+7vXbKRthbK3cd/qyDqv2YA3war8+0zyuWIu4f/+OSbSOrWIZnVir8hihMw== h.meijering@rug.nl'
+          - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHRljLyqLFz+lvYCuYz/YANvrXmzFaw1EFA2K3ARWDmQ h.meijering@rug.nl'
 
     - user:
         name: alex
@@ -102,20 +92,6 @@
         key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSwGsrMj9NqSukZKo1AP7phcKTbPf1v/uMCX2pyTtgOdz2gmFpw1ZvR7We8V/cnY+FegZ9ttkoIJ697uyDv0s8lf/5Iv291P696iLKrL9yrRdnCiuU7HwCqCIiJz0QrIm5/9bCRecRRn2LUrMPfCZz/s+FVoGpgWMwe1NPY+TzTNZ/De8YYt/rU/74TDuG8c/yjMDpjjxdrFtAnesNABrXZF7c5bwTUphFB5nPRamQPi/vZAACilLe2Mc75d8fh4UVITKJbM6KJjj3dRwmWiU03+hlKMaHm9gPUR8EClx7SsxCABC621RIVmYDEvoXbigM33rJ6O+kAJh5HvcJxHmF marocico@marocico-HP-Z230-Tower-Workstation'
         state: present
 
-    - user:
-        name: jpm
-        comment: "J.P. Mc Farland"
-        group: admin
-        state: present
-
-    - authorized_key:
-        user: jpm
-        key: '{{ item }}'
-        state: present
-      with_items:
-        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4Fpy1W97z/jODxBrP1YrIWCfP5tzegwEesGUcX5/Y2 j.p.mc.farland@rug.nl'
-        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIEpnrjsbHr0uRWD9rxwnqp0f8wO5CzKOrv2s8n8CDSQsLJ0TBNpAsf0oniHVU2wwILsBX1tpjdKO22bE9nxStj7ySzuNZYsfaw03fNnM/tr0YKnbfujTcWp6U4MK+Qcf5mM7vtv/c1fkcG14cGeGusN6f3mVFoIX/ICid6orJWVnHBE077nCcMXO+ezeJS0jt7r6mC3WI+2FmF8ml8CGkpfHlEO6r5RK2LS4z5IoXJMLHodlWVmVIBVFWmUJnAAp0csFjScPajf5AK07VPrnGOCBFtlDS7ndNaVLJDSf+omiQrylXvfYlDUptsM0ZwiZDiBHpfN0CxOLbNIewYkS5IFzxvUPvzecCa2WAcOadNuQhBTxeNftVGg7A/7wXHeFnZ5srX2K1apUbbC1xTquFnng/LZB+o9pqhSaS2cXxNlun/Ha2uZeNFDgge8JhB5BD51AJFF9WXIkGcZetRJ2vG6XzJltc6rPBmK1VVfrVlphjUsKQrY+DFN7MCQs1WVhohrbJ+4iNYydBMMZ3rVuSr6Ksx+jv3H7d3ZdoFB+/GtaaRoPun3HucGWccrtvHezdm3Ibe6uO2ung1hU1ItnY1Cgp8b4yz0MO7Pfx3FQO9957PkQciNMdzyEnMhWl0OzUp2/AdQsUhlSgL+jNGzDpbcW8CZ1mo765lsXWaqtMSw== j.p.mc.farland@rug.nl'
-
     - user:
         name: ger
         comment: "Ger Strikwerda"
@@ -124,32 +100,5 @@
 
     - authorized_key:
         user: ger
-        key: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJmWG8TpwHdU0DMEt6ItzwrV4cW4slwRAUWpaTgbCIor g.j.c.strikwerda@rug.nl'
-        state: present
-
-    - user:
-        name: robin
-        comment: "Robin Teeninga"
-        group: admin
-        state: present
-
-    - authorized_key:
-        user: robin
-        key: '{{ item }}'
-        state: present
-      with_items:
-        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXeVMbqjC0EKu8cmuxN+88l0TnzJUuRaFLufka2Mx9Adj8PtAZ4l9IP7f+O97ylbNQvci9DcC38NNe62b0ECutin3jUX9trvROYgxVMR/P89y139CSwWqBrHm29WLHdz9A0vO094HNzhp4xFVnblBUAFt3CCDIxvl59coV2bWgTykmVEoni9SSjqKgcC1hT0mIGcaDb428x9DsteJSakSNYwFbnbEbukA7Y5KQnbzaMl/h97C2FOsxiU5JZoiHgKNXCR5jkFsHzc3OEphXW1Ba4EnqsqUecpnfUr6OueFYR6a/q+AtIKVYT10lzCimXui/uf5zkntq1Kga/h3VtgmV root@robin-HP-Compaq-Elite-8300-MT'
-        - 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAkiHonMN0PNdi/9yT8TzjWdFXWsL2csUwvZH0fbepSIo97bf/CBjv5n4/r/QjUEQjPFVgfdIeM490U1FIpUGaJZFGFTvG5FLEEOhzCaOWsrFK1t6wRRkIfu+ui8nnUGaY94zVRR/JD3zbnyE7DAHoYmX25eR2CkvQQaX1nWovA8zmDCsczI1tIjYilHgWTjIBYgAmWm+V9DQ2ctX4Nt9pNixJNEPO4g7NDijN7hmd9jWW5Ntt9XqKSie/U86WCl6It49ntXz3IGjh3bcrC6nWkTyypMBapB57HG/lfTkCZ+O5BN6TSzqsj82uvEz31vZJziAjQzYodZqtHxbut6lFsMLiuwBQL/Lb0PkFLAgfVpuCTMaOoNERE2kzALysfIV5x7r0wbhr3W8lVgluDn1hZ/ij2AdtTwtGyt7S5YBLMia6kGqt87RcBsEVPyUNWekuNBdOLDjnTTNpMW10WhUqpsoPQ5Su+PKyHY8T612AlZfYvZsYnFUPb0T6Y6AcK8HENVGgz2C2xUiDRAeiUq7XRGcUWBIEqLwG7qWtlLa1wJOyHOk3g2AaEBqmiXoOTmDrLb0lb6ZGlTfvZnEt5E70SlWEMU8d8qIAcWrSGnmWN/ynHKX1hYKbd2eMVCzp/vKNrOBJjUid+9cyFt2thu7URG7V+HZA7nj/Kx8FY9kDswE= rsa-key-laptop'
-        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMDJBGlfZOdvMQTZSR4WI9vA1PZcRGkbSR9cd1LiNEVM ed25519-key-laptop' 
-
-
-    - user:
-        name: henkjan
-        comment: "Henk-Jan Zilverberg"
-        group: admin
-        state: present
-
-    - authorized_key:
-        user: henkjan
-        key: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKOKgVel0GbF67zZaVR0TFo82e5XeZOP1e3Ld3gIdaER h.j.zilverberg@rug.nl'
+        key: 'ssh-dss AAAAB3NzaC1kc3MAAACBAMJfiOS0W95C1+r7IBgBR8CqEGpJZ8viv4bpzXWNtDTYLFbfb4rL/PgzlCQqhqJbKCkHluJPHPNAeaW8KalHvqUrtD5xciX8PovcMhkg9Dksp9P5WGKCVfJb5MKwfdtEM9tgq9OjNZFN0nF3R6oW42DvxDKu3mXWiH1PH1I4arQdAAAAFQDxHkrRaQ/t4wH2nO6WN9jWEUNiAwAAAIBR5zi9P3JudJu3dddweDaXlVXY51cGQjXvxFJtFv1d5/jI2gCxcah1dLqkJMwGgFowF4imqUXFit20kNQiG5bUnuGEJWfTg/BkaM7W3ujRxDK6wIQCvAnQ0+zJR/qMqqH7MFlutcEm+uVuACs5abvDOp0scHaOuvGfIyf+qegvLAAAAIB577xm9csmftKclreLmigUksY4zlWoIVYsjgB4ofDVemtHTGYWFBSxQsbhhUrUhB6+AcTRGJnvLyJSaEQdCghVJKEIrGl9YA9lgztd8YAHsG2iVve1mMiFI/8NYJHMWJLuFratq5eC5tpBaW+MTm21NqHKD5Ry88Ul04n+sv5lfw== ger@rc-514'
         state: present