Merge PR#46: add fgenesis ssh key to tuergit

diff --git a/ansible/group_vars/all/users.yml b/ansible/group_vars/all/users.yml
index 73334e4..f6470e7 100644 (file)
--- a/ansible/group_vars/all/users.yml
+++ b/ansible/group_vars/all/users.yml
@@ -35,3 +35,9 @@ users:
     email: fg@realraum.at
     ssh:
       - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMhJQDIBRrq5eut7UA8Fu/BFfDZvvGBRi79OVcNCXuJfSVdvwbUUrM2ItDswmGWvcy1EZCIvjU4hlVO6xtgRcbxDErGMkGp83QNYcRbQcf3AX/etMI18vPhOdBBAL2bvPHbGIEHFUFcnGM4EnvAa1E90Vu3wCEDNcXtGGHu8uVwGQqRvJfXej1ov7FoQzC32+DpF7kubR4agzkSGYRAHb45edIm+mXI4/tzBWxY94Sx7o+Lvw9SXqs4Z5G1Ezufaal1c8UJncpYsv1+7zQANV7EK7RA931OvKd0yGLerEjgjPjuTa2jOaGibtqlkmOEjG4UI/p+TtPtAxN3a/BUC0H fg@nullptr
+
+  verr:
+    email: stefan@2904.cc
+    gpg: 0xEF55302141210EA0
+    ssh:
+      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFKJgOGEyn38spg7FvdEBvy87emQPBJCNJU9rADUmzKo5b3PHX9lBNg/XqG9ToqbqmXLqko67OFGJPd7rrU6qFpXgtDGsF8RMU6A1SuTubGVTlh0TblXYfkW3sz+oVUqBIBaH/6fUMPbMQtVqs1gM4KbG5B0WUMst7VVN++zw2AE3pKX8vFjKsUyYW1i55dlPg2AhgOi3VMBkzrUfQj2wcMCChoaTwLZMSirBT0J5NWn63P+KllWfgVZIX11/pf6XK8r/HpU7os+u36b7uwWi5uJmQnuFVQOLFvkkQhQKzO0gQoyasDHkbMdV6UOBpMsg6wUmd2JOvsiW+tupnFJgt stefan@thinkbook

diff --git a/ansible/host_playbooks/ctf.yml b/ansible/host_playbooks/ctf.yml
new file mode 100644 (file)
index 0000000..32d7dea
--- /dev/null
+++ b/ansible/host_playbooks/ctf.yml
@@ -0,0 +1,5 @@
+---
+- name: Basic Setup for ctf
+  hosts: ctf
+  roles:
+  - role: base

diff --git a/ansible/host_vars/ctf/main.yml b/ansible/host_vars/ctf/main.yml
index 5191ee0..6273f7f 100644 (file)
--- a/ansible/host_vars/ctf/main.yml
+++ b/ansible/host_vars/ctf/main.yml
@@ -1,4 +1,46 @@
 ---
+ssh_users_root:
+  - verr
+  - equinox
+  - nicoo
+
 sshd_allowusers_host:
   - f0rki
   - verr
+
+# SSH configuration
+## There are no individual user accounts
+localconfig_ssh_config_user: root
+## ctf.realraum.at doesn't resolve to the new VM (yet)
+ansible_host: 89.106.211.47
+
+# VM installation
+vm_host: alfred
+
+install:
+  host: "{{ vm_host }}"
+  mem: 2048
+  numcpu: 2
+  disks:
+    primary: vda
+    virtio:
+      vda:
+        vg: "{{ vm_host }}"
+        lv: "{{ inventory_hostname }}"
+        size: 20g
+  interfaces:
+  - bridge: br-lan ## this will be br-pub once the network renumbering is done
+    name: pub0
+  autostart: True
+
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
+  domain: realraum.at
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary:
+    ## TODO: this should come from {{ net.pub.* }} once the network renumbering is done
+    interface: pub0
+    ip: 89.106.211.47
+    mask: 255.255.255.224
+    gateway: 89.106.211.33