cleanup old linuxtage stuff and add new glt-jitsi

6 files changed, 2 insertions, 111 deletions

diff --git a/inventory/group_vars/glt-c3voc/vars.yml b/inventory/group_vars/glt-c3voc/vars.yml
index 65185f33..9ed69195 100644
--- a/inventory/group_vars/glt-c3voc/vars.yml
+++ b/inventory/group_vars/glt-c3voc/vars.yml
@@ -1,6 +1,4 @@
 ---
-zsh_banner: linuxtage
-
 ssh_users_root:
   - equinox
   - kunsi
diff --git a/inventory/group_vars/glt-live-misc/vars.yml b/inventory/group_vars/glt-live-misc/vars.yml
deleted file mode 100644
index 4f1862b5..00000000
--- a/inventory/group_vars/glt-live-misc/vars.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-install:
-  cloud:
-    credentials:
-      token: "{{ vault_hcloud_api_token }}"
-
-
-apt_repo_provider: hetzner
-
-ssh_keys_root_extra:
-  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/tPDEC1q6YIhKKYK3ioN+flmB2ACw0X7rew144g71jeD1/ZXt2JaPJND8TiGAITtM7jOAc6EVHCjpRrA71+tOu119T/0ewRDTTg1B+X7/MgiXtV7OaG0SuxULrzHv2oH0XWX750EKqdRN56uw2WKkyHQafKgPULIYcRKuj2NbUxh3jnbwA3yaPZ47I+nSRUuLLPr87eoaeJB0LYvK0DfDoe5jlwds8lp20jbY5SVYlPH+tqRo//hiYWbEUL5h3aFqOlphXp3eTnK1uUfWoII6IEudMfj7+ajn17CDd9THMNyIN7EdyZ7Lum9sIMjU1JGbT+xW1t6VVx0pGY2zmTt6XTVYrGmc/T/yD+aQZHKtaiRrvZiL5Izl5gkrvXgFmjgebMlLm6adplqK239PoyjgVjxBiZbKwsEq+YmNrCWImwoJ7d1j52Z0CqIcWF6DrXbT0nAFuIYayVjBSMvf2/dnan6NhYPxj+yfAUVUkhza5jtVW6woIgJlZ5Zi3rXmXDE= emergency@glt
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHB2GxQrL18sfbdgTvaimYR/F94UtZ3BMA8cNQyTzT8h martin@adelmann
-  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCvzYsE/QAjqvmNU1MoYzd9FTe+xmNadvosoQHyyXYh5qBQYI5AfCpeZmkHgSrdUOiA4Z6BOW5RvDjbHQlQK2D3I1uuCSGIt830t4btbuffCw+6HpnZ9Q7Q/1GKLaUH+qdHISoNmt+3eFUPr3Xg5CK3fJ8zfCxjagHxn7AVXPBqJK5fRYtmXLNVo8NaoTe3o3YhChD7sR1FlzZhFIeqVHFJxvwFYtYbXfwsJI43oQON+oxHCIRodJDrUwsqBXIeqxJGBi/UjTHLaxBpy89oi5kZjPhmZDu3vyJpcEn9vkVpwKgKK110Zya2F07CXLTE/6VoetwAYeWDBiZiXfbLI7SPr1PZ+wkd8UX/evdEhJhh3ySW9Gi3n2AzCz8tUJPJvDxqr+KpiI138dYLAyuLoRK4I2MbvO/5/zAqByZP10Ru3MLunHrNsiI/pSu4bvOnwM8F71w9fkTuv5jOeIJo5YHupJZsl7LfcRwokxFMhJ2bk5fiJFvDeHkCKfnlq/dq7zk= lukas@regular
-  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC5dIGN5o3LKThsA/hnTqazsVW5UNuGxia6Kheq40UChnfiF0+XaNRgXZYWO9HvKO0Cer9srZy9Ok1YirQBHAujRZmvnk3il7cbxepD+j2+oPaL57mevYD5lBzVqoqANCaTaq5if7aQEwGOqgz1HFtU44ElgAEjamwFfAOG3WPckOjGmqnSGQrS7+tZg/Z8S7d1zjbUJvXbvwehMpFz8pun2E1FhFrDWmmP4bA4GXGMAZvXDQ5bLeb4uspUI2N8oAFGvf5SxXLiZx2VmOf6ZIVS4FZqweR6wI0C8RBJuvAtzThZgaCY3kIrQKxD+eYYgBJB+mMYySoUQBFHaBW967v5T+2uR9oxD8l21lb39E3R6fhn3YM4BTv67GR2B1fvryu7Wz5u5wMW6dOptpVoyVaYbQAUcb0wRhzZzDjoL7xH+dYio6rs4BjtpWjspi0tRtN/L7H59qvZLxzK/VsBj82t2fXylE+/LnZQ+yNvcqHteJS+VH4LxTNOzqlaaRJ0GYs= ansible@glt
-  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCdm5WCNt0ul9R7B8ndbuh8aw+OWXDEx0jjXI2Ep8TcjXlo7b2NScunqZHA9WkLNNi8f46N1c2UYm7LVrLFs1mWaaVPeM0jzBHPXCVJPJDMiWPfdxsIQqKM+q09kVlGGNGQvEeVYVLPg+K2t/sEdPgjb7/UhOblurQhQewWvvypReVLhPU5K8/ZCh/uXHmBxmp0kcm0UhIJ73tjdpIoeseQgA7FjA/h1lKKakChu3kqGHL0FJmH9ZcMfPkYUziQ6hv583PrU03vq5Q3J+tyXR3ytY1yqTUntnkHHE6e2Q3zfFWZcrhgUG6UOch2exv1vH2c1yBL3EYecZ/1s2gx/7QX0rrP2byMRorvnAY06rIQ5HXBJrUMEPsiTM16EfLHC1CsolsKTEQ+2DrrqSCACJmO+La8QunqA6l0G2SnRCW6I/A3RATzP6V2bUuJpBnS3hVfP5Q11xO+8zfu/58i3S3EaMNsUc8GwxJ9L6sjTO3W2LQ1UsG2fECPm9Ghec6iJyM= spel@lspe.organsible
diff --git a/inventory/group_vars/glt-live-r3/vars.yml b/inventory/group_vars/glt-live-r3/vars.yml
deleted file mode 100644
index 8c360f8d..00000000
--- a/inventory/group_vars/glt-live-r3/vars.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-apt_repo_provider: anexia
-#apt_repo_provider: ffgraz
diff --git a/inventory/group_vars/glt-live/network.yml b/inventory/group_vars/glt-live/network.yml
deleted file mode 100644
index e78ddd2d..00000000
--- a/inventory/group_vars/glt-live/network.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-network_zones:
-  r3_lan:
-    description: "realraum LAN, Internetuplink via Magenta"
-    vlan: 127
-    prefix: 192.168.127.0/24
-    gateway: 192.168.127.254
-    dns:
-    - 192.168.127.254
-    dhcp:
-      start: 1
-      limit: 149
-    offsets:
-      # Saal 1
-      glt-s1mod: 150
-      glt-s1slide: 151
-      glt-s1speak1: 152
-      glt-s1speak2: 153
-      glt-s1info: 154
-      glt-dione: 155
-      glt-calypso: 156
-      glt-s1atemctl: 157
-      glt-s1atem: 158
-      glt-s1switch: 159
-      # Saal 2
-      glt-s2mod: 160
-      glt-s2slide: 161
-      glt-s2speak: 162
-      glt-s2info: 163
-      glt-helene: 165
-      glt-telesto: 166
-      glt-s2atemctl: 167
-      glt-s2atem: 168
-      glt-s2switch: 169
-      # Saal 3
-      glt-s3mod: 170
-      glt-s3slide: 171
-      glt-s3speak: 172
-      glt-s3info: 173
-      glt-tsdatacop: 175
-      glt-thetys: 176
-      glt-s3atemctl: 177
-      glt-s3atem: 178
-      glt-s3switch: 179
-      # misc
-      equinox-t450s: 190
-      spel: 191
-      glt-gw-r3: 199
-
-  r3_ff:
-    description: "realraum Funkfeuer Subnet, Internetuplink via Funkfeuer and mur.at"
-    vlan: 255
-    prefix: 10.12.240.240/28
-    gateway: 10.12.240.247
-    dns:
-    - 10.12.0.10
-    offsets:
-      glt-gw-r3: 8
-
-  murat_transfer:
-    description: "transfer network for upstream via mur.at"
-    prefix: 172.31.255.240/28
-    offsets:
-      ele-tub: 1
-      ff-10g: 2
-      ele-mur: 14
-
-  tug_lan:
-    description: "glt@tug LAN, Internetuplink via TUG and ACOnet"
-    prefix: 192.168.27.0/24
-    gateway: 192.168.27.254
-    dns:
-    - 192.168.27.254
-    dhcp:
-      start: 1
-      limit: 199
-    offsets:
-      glt-gw-tug: 254
diff --git a/inventory/group_vars/glt-live/vars.yml b/inventory/group_vars/glt-live/vars.yml
deleted file mode 100644
index 65287b3a..00000000
--- a/inventory/group_vars/glt-live/vars.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-zsh_banner: linuxtage
-
-ssh_users_root:
-  - equinox
-  - spel
-
-acme_account_email: equinox@spreadspace.org
-acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
-
-apt_repo_blackmagic_auth:
-  username: "glt"
-  password: "{{ vault_apt_repo_blackmagic_auth.password }}"
diff --git a/inventory/group_vars/linuxtage/vars.yml b/inventory/group_vars/linuxtage/vars.yml
new file mode 100644
index 00000000..370ba5b2
--- /dev/null
+++ b/inventory/group_vars/linuxtage/vars.yml
@@ -0,0 +1,2 @@
+---
+zsh_banner: linuxtage