summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2024-04-03 20:18:22 +0200
committerChristian Pointner <equinox@spreadspace.org>2024-04-03 20:18:22 +0200
commitb90a0f8dfdcfc045bdfef50ce0e91bbd056f3d47 (patch)
treee4a3b32502905113b1c1a499ee6a2a10e3af78c3
parentnginx/vhost: fix string concat issue incase nginx_vhost.name is not a string (diff)
cleanup old linuxtage stuff and add new glt-jitsi
-rw-r--r--_graveyard_/files/glt/stream-stats.go (renamed from files/glt/stream-stats.go)0
-rw-r--r--_graveyard_/inventory/group_vars/glt-live-misc/vars.yml (renamed from inventory/group_vars/glt-live-misc/vars.yml)0
-rw-r--r--_graveyard_/inventory/group_vars/glt-live-r3/vars.yml (renamed from inventory/group_vars/glt-live-r3/vars.yml)0
-rw-r--r--_graveyard_/inventory/group_vars/glt-live/network.yml (renamed from inventory/group_vars/glt-live/network.yml)0
-rw-r--r--_graveyard_/inventory/group_vars/glt-live/vars.yml (renamed from inventory/group_vars/glt-live/vars.yml)0
-rw-r--r--_graveyard_/inventory/host_vars/glt-calypso.yml (renamed from inventory/host_vars/glt-calypso.yml)0
-rw-r--r--_graveyard_/inventory/host_vars/glt-coturn.yml (renamed from inventory/host_vars/glt-coturn.yml)0
-rw-r--r--_graveyard_/inventory/host_vars/glt-gw-r3.yml (renamed from inventory/host_vars/glt-gw-r3.yml)0
-rw-r--r--_graveyard_/inventory/host_vars/glt-gw-tug.yml (renamed from inventory/host_vars/glt-gw-tug.yml)0
-rw-r--r--_graveyard_/inventory/host_vars/glt-meet1.yml (renamed from inventory/host_vars/glt-meet1.yml)0
-rw-r--r--_graveyard_/inventory/host_vars/glt-meet2.yml (renamed from inventory/host_vars/glt-meet2.yml)0
-rw-r--r--_graveyard_/inventory/host_vars/glt-stream.yml (renamed from inventory/host_vars/glt-stream.yml)0
-rw-r--r--_graveyard_/inventory/host_vars/glt-tsdatacop.yml (renamed from inventory/host_vars/glt-tsdatacop.yml)0
-rw-r--r--_graveyard_/inventory/hosts.ini49
-rw-r--r--_graveyard_/spreadspace/glt-calypso.yml (renamed from spreadspace/glt-calypso.yml)0
-rw-r--r--_graveyard_/spreadspace/glt-coturn.yml (renamed from spreadspace/glt-coturn.yml)0
-rw-r--r--_graveyard_/spreadspace/glt-meet1.yml (renamed from spreadspace/glt-meet1.yml)0
-rw-r--r--_graveyard_/spreadspace/glt-meet2.yml (renamed from spreadspace/glt-meet2.yml)0
-rw-r--r--_graveyard_/spreadspace/glt-stream.yml (renamed from spreadspace/glt-stream.yml)0
-rw-r--r--_graveyard_/spreadspace/glt-tsdatacop.yml (renamed from spreadspace/glt-tsdatacop.yml)0
-rw-r--r--_graveyard_/spreadspace/group_vars/glt-live.yml (renamed from spreadspace/group_vars/glt-live.yml)0
-rw-r--r--_graveyard_/spreadspace/host_vars/glt-coturn.yml (renamed from spreadspace/host_vars/glt-coturn.yml)0
-rw-r--r--_graveyard_/spreadspace/host_vars/glt-meet1.yml (renamed from spreadspace/host_vars/glt-meet1.yml)0
-rw-r--r--_graveyard_/spreadspace/host_vars/glt-meet2.yml (renamed from spreadspace/host_vars/glt-meet2.yml)0
-rw-r--r--files/chaos-at-home/bind-zones/db.spreadspace18
-rw-r--r--inventory/group_vars/glt-c3voc/vars.yml2
-rw-r--r--inventory/group_vars/linuxtage/vars.yml2
-rw-r--r--inventory/host_vars/glt-jitsi.yml73
-rw-r--r--inventory/hosts.ini44
-rw-r--r--spreadspace/glt-jitsi.yml19
-rw-r--r--spreadspace/group_vars/linuxtage.yml14
-rw-r--r--spreadspace/host_vars/glt-jitsi.yml18
32 files changed, 183 insertions, 56 deletions
diff --git a/files/glt/stream-stats.go b/_graveyard_/files/glt/stream-stats.go
index 6920b513..6920b513 100644
--- a/files/glt/stream-stats.go
+++ b/_graveyard_/files/glt/stream-stats.go
diff --git a/inventory/group_vars/glt-live-misc/vars.yml b/_graveyard_/inventory/group_vars/glt-live-misc/vars.yml
index 4f1862b5..4f1862b5 100644
--- a/inventory/group_vars/glt-live-misc/vars.yml
+++ b/_graveyard_/inventory/group_vars/glt-live-misc/vars.yml
diff --git a/inventory/group_vars/glt-live-r3/vars.yml b/_graveyard_/inventory/group_vars/glt-live-r3/vars.yml
index 8c360f8d..8c360f8d 100644
--- a/inventory/group_vars/glt-live-r3/vars.yml
+++ b/_graveyard_/inventory/group_vars/glt-live-r3/vars.yml
diff --git a/inventory/group_vars/glt-live/network.yml b/_graveyard_/inventory/group_vars/glt-live/network.yml
index e78ddd2d..e78ddd2d 100644
--- a/inventory/group_vars/glt-live/network.yml
+++ b/_graveyard_/inventory/group_vars/glt-live/network.yml
diff --git a/inventory/group_vars/glt-live/vars.yml b/_graveyard_/inventory/group_vars/glt-live/vars.yml
index 65287b3a..65287b3a 100644
--- a/inventory/group_vars/glt-live/vars.yml
+++ b/_graveyard_/inventory/group_vars/glt-live/vars.yml
diff --git a/inventory/host_vars/glt-calypso.yml b/_graveyard_/inventory/host_vars/glt-calypso.yml
index afa7766c..afa7766c 100644
--- a/inventory/host_vars/glt-calypso.yml
+++ b/_graveyard_/inventory/host_vars/glt-calypso.yml
diff --git a/inventory/host_vars/glt-coturn.yml b/_graveyard_/inventory/host_vars/glt-coturn.yml
index 6dc0f5c4..6dc0f5c4 100644
--- a/inventory/host_vars/glt-coturn.yml
+++ b/_graveyard_/inventory/host_vars/glt-coturn.yml
diff --git a/inventory/host_vars/glt-gw-r3.yml b/_graveyard_/inventory/host_vars/glt-gw-r3.yml
index d5d8538e..d5d8538e 100644
--- a/inventory/host_vars/glt-gw-r3.yml
+++ b/_graveyard_/inventory/host_vars/glt-gw-r3.yml
diff --git a/inventory/host_vars/glt-gw-tug.yml b/_graveyard_/inventory/host_vars/glt-gw-tug.yml
index 5e1d0a45..5e1d0a45 100644
--- a/inventory/host_vars/glt-gw-tug.yml
+++ b/_graveyard_/inventory/host_vars/glt-gw-tug.yml
diff --git a/inventory/host_vars/glt-meet1.yml b/_graveyard_/inventory/host_vars/glt-meet1.yml
index a7d619c8..a7d619c8 100644
--- a/inventory/host_vars/glt-meet1.yml
+++ b/_graveyard_/inventory/host_vars/glt-meet1.yml
diff --git a/inventory/host_vars/glt-meet2.yml b/_graveyard_/inventory/host_vars/glt-meet2.yml
index b194b9f6..b194b9f6 100644
--- a/inventory/host_vars/glt-meet2.yml
+++ b/_graveyard_/inventory/host_vars/glt-meet2.yml
diff --git a/inventory/host_vars/glt-stream.yml b/_graveyard_/inventory/host_vars/glt-stream.yml
index db9292da..db9292da 100644
--- a/inventory/host_vars/glt-stream.yml
+++ b/_graveyard_/inventory/host_vars/glt-stream.yml
diff --git a/inventory/host_vars/glt-tsdatacop.yml b/_graveyard_/inventory/host_vars/glt-tsdatacop.yml
index c78513a6..c78513a6 100644
--- a/inventory/host_vars/glt-tsdatacop.yml
+++ b/_graveyard_/inventory/host_vars/glt-tsdatacop.yml
diff --git a/_graveyard_/inventory/hosts.ini b/_graveyard_/inventory/hosts.ini
index a0381990..bf8ab79e 100644
--- a/_graveyard_/inventory/hosts.ini
+++ b/_graveyard_/inventory/hosts.ini
@@ -28,6 +28,34 @@ r3-cccamp19-av host_name=av
###############################
# environment: spreadspace
+[glt-live:vars]
+host_domain=linuxtage.at
+env_group=spreadspace
+
+[glt-live:children]
+glt-live-misc
+glt-live-r3
+glt-live-tug
+
+[glt-live-misc]
+glt-coturn host_name=cdn13
+glt-meet1 host_name=meet1
+glt-meet2 host_name=meet2
+glt-stream host_name=stream
+
+[glt-live-r3]
+glt-gw-r3 host_name=gw-r3
+#glt-dione host_name=dione
+#glt-helene host_name=helene
+glt-calypso host_name=calypso
+#glt-telesto host_name=telesto
+glt-tsdatacop host_name=tsdatacop
+#glt-thetys host_name=thetys
+
+[glt-live-tug]
+glt-gw-tug host_name=gw-tug
+
+
[lendwirbel-live:vars]
host_domain=lndwrbl.live
env_group=spreadspace
@@ -77,6 +105,11 @@ ele-laptop host_name=elevatop
###############################
# host categories
+## OS
+[openwrt]
+glt-gw-r3
+glt-gw-tug
+
[dellos6]
r3-cccamp19-sw0
@@ -118,6 +151,12 @@ lw-master
sgg-icecast
+[hcloud]
+glt-coturn
+glt-meet1
+glt-meet2
+glt-stream
+
[hcloud:children]
lendwirbel-live-dist
lendwirbel-live-xx
@@ -128,6 +167,16 @@ k8s-lwl
[standalone-kubelet]
lw-thetys
sgg-icecast
+glt-coturn
+glt-meet1
+glt-meet2
+glt-dione
+glt-helene
+glt-calypso
+glt-telesto
+glt-tsdatacop
+glt-thetys
+
### Kubernetes Cluster: lendwirbel-live
[k8s-lwl-encoder]
diff --git a/spreadspace/glt-calypso.yml b/_graveyard_/spreadspace/glt-calypso.yml
index 07dd2eb2..07dd2eb2 100644
--- a/spreadspace/glt-calypso.yml
+++ b/_graveyard_/spreadspace/glt-calypso.yml
diff --git a/spreadspace/glt-coturn.yml b/_graveyard_/spreadspace/glt-coturn.yml
index 91641cd5..91641cd5 100644
--- a/spreadspace/glt-coturn.yml
+++ b/_graveyard_/spreadspace/glt-coturn.yml
diff --git a/spreadspace/glt-meet1.yml b/_graveyard_/spreadspace/glt-meet1.yml
index b2447cd8..b2447cd8 100644
--- a/spreadspace/glt-meet1.yml
+++ b/_graveyard_/spreadspace/glt-meet1.yml
diff --git a/spreadspace/glt-meet2.yml b/_graveyard_/spreadspace/glt-meet2.yml
index f91dd3a8..f91dd3a8 100644
--- a/spreadspace/glt-meet2.yml
+++ b/_graveyard_/spreadspace/glt-meet2.yml
diff --git a/spreadspace/glt-stream.yml b/_graveyard_/spreadspace/glt-stream.yml
index c76904ab..c76904ab 100644
--- a/spreadspace/glt-stream.yml
+++ b/_graveyard_/spreadspace/glt-stream.yml
diff --git a/spreadspace/glt-tsdatacop.yml b/_graveyard_/spreadspace/glt-tsdatacop.yml
index 82c363ab..82c363ab 100644
--- a/spreadspace/glt-tsdatacop.yml
+++ b/_graveyard_/spreadspace/glt-tsdatacop.yml
diff --git a/spreadspace/group_vars/glt-live.yml b/_graveyard_/spreadspace/group_vars/glt-live.yml
index c3acc3db..c3acc3db 100644
--- a/spreadspace/group_vars/glt-live.yml
+++ b/_graveyard_/spreadspace/group_vars/glt-live.yml
diff --git a/spreadspace/host_vars/glt-coturn.yml b/_graveyard_/spreadspace/host_vars/glt-coturn.yml
index 8db669d5..8db669d5 100644
--- a/spreadspace/host_vars/glt-coturn.yml
+++ b/_graveyard_/spreadspace/host_vars/glt-coturn.yml
diff --git a/spreadspace/host_vars/glt-meet1.yml b/_graveyard_/spreadspace/host_vars/glt-meet1.yml
index 27359daf..27359daf 100644
--- a/spreadspace/host_vars/glt-meet1.yml
+++ b/_graveyard_/spreadspace/host_vars/glt-meet1.yml
diff --git a/spreadspace/host_vars/glt-meet2.yml b/_graveyard_/spreadspace/host_vars/glt-meet2.yml
index 96f9f897..96f9f897 100644
--- a/spreadspace/host_vars/glt-meet2.yml
+++ b/_graveyard_/spreadspace/host_vars/glt-meet2.yml
diff --git a/files/chaos-at-home/bind-zones/db.spreadspace b/files/chaos-at-home/bind-zones/db.spreadspace
index 76495109..5ddd8390 100644
--- a/files/chaos-at-home/bind-zones/db.spreadspace
+++ b/files/chaos-at-home/bind-zones/db.spreadspace
@@ -1,7 +1,7 @@
$TTL 1h
@ SOA ns0.chaos-at-home.org. hostmaster (
- 2023100100
+ 2024040300
1h
5m
30d
@@ -36,18 +36,4 @@ rhgit A 212.17.109.195
; GLT
-gl0t1 600 CNAME linuxtage.at.
-glt02 600 CNAME linuxtage.at.
-glt03 600 CNAME linuxtage.at.
-glt04 600 CNAME linuxtage.at.
-glt05 600 CNAME linuxtage.at.
-glt06 600 CNAME linuxtage.at.
-glt07 600 CNAME linuxtage.at.
-glt08 600 CNAME linuxtage.at.
-glt09 600 CNAME linuxtage.at.
-glt10 600 CNAME linuxtage.at.
-glt11 600 CNAME linuxtage.at.
-glt12 600 A 159.69.7.206
-glt13 600 A 116.203.33.90
-glt-live 600 CNAME linuxtage.at.
-glt-stream 600 A 188.34.176.173
+glt-jitsi 600 A 128.140.2.55
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/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
diff --git a/inventory/host_vars/glt-jitsi.yml b/inventory/host_vars/glt-jitsi.yml
new file mode 100644
index 00000000..4242da92
--- /dev/null
+++ b/inventory/host_vars/glt-jitsi.yml
@@ -0,0 +1,73 @@
+---
+install:
+ cloud:
+ credentials:
+ token: "{{ vault_hcloud_api_token }}"
+
+
+docker_storage:
+ type: lvm
+ vg: "{{ host_name }}"
+ lv: docker
+ size: 5G
+ fs: ext4
+
+kubelet_storage:
+ type: lvm
+ vg: "{{ host_name }}"
+ lv: kubelet
+ size: 5G
+ fs: ext4
+
+
+spreadspace_apt_repo_components:
+ - container
+ - prometheus
+
+acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
+acme_client: acmetool
+
+
+kubernetes_version: 1.29.3
+kubernetes_container_runtime: docker
+kubernetes_standalone_max_pods: 100
+kubernetes_standalone_cni_variant: with-portmap
+
+
+jitsi_meet_base_path: /srv/jitsi/meet
+
+jitsi_meet_version: stable-9364-1
+jitsi_meet_hostname: glt-jitsi.spreadspace.org
+
+jitsi_meet_p2p_enable: no
+jitsi_meet_require_display_name: yes
+
+jitsi_meet_resolution:
+ default:
+ width: 1920
+ height: 1080
+ min:
+ width: 1280
+ height: 720
+
+jitsi_meet_jvb_config_extra: |
+ videobridge {
+ cc {
+ trust-bwe = false
+ onstage-preferred-framerate = 25
+ }
+ }
+
+jitsi_meet_secrets: "{{ vault_jitsi_meet_secrets }}"
+
+jitsi_meet_auth:
+ enable_guests: yes
+ users:
+ operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}"
+
+jitsi_meet_streamui:
+ http_port: "{{ jitsi_meet_http_port + 1 }}"
+# http_auth:
+# operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}"
+ image_tag: latest
+ default_control_room: ohro0tum
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 376ec48e..994b1243 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -142,32 +142,15 @@ s2-mr-snuggles host_name=mr-snuggles
s2-chromebook host_name=chromebook
-[glt-live:vars]
-host_domain=linuxtage.at
+[linuxtage:vars]
+host_domain=spreadspace.org
env_group=spreadspace
-[glt-live:children]
-glt-live-misc
-glt-live-r3
-glt-live-tug
-
-[glt-live-misc]
-glt-coturn host_name=cdn13
-glt-meet1 host_name=meet1
-glt-meet2 host_name=meet2
-glt-stream host_name=stream
-
-[glt-live-r3]
-glt-gw-r3 host_name=gw-r3
-#glt-dione host_name=dione
-#glt-helene host_name=helene
-glt-calypso host_name=calypso
-#glt-telesto host_name=telesto
-glt-tsdatacop host_name=tsdatacop
-#glt-thetys host_name=thetys
+[linuxtage]
+glt-jitsi
-[glt-live-tug]
-glt-gw-tug host_name=gw-tug
+[linuxtage:children]
+glt-c3voc
[glt-c3voc:vars]
@@ -318,8 +301,6 @@ ch-gw-c3voc
ch-raspi-openwrt
mz-ap
mz-router
-glt-gw-r3
-glt-gw-tug
ele-router-hmtsaal
ele-router-orpheum
ele-router-emc
@@ -535,10 +516,6 @@ ch-mimas
ele-lt
ele-coturn
ele-jitsi
-glt-coturn
-glt-meet1
-glt-meet2
-glt-stream
[hcloud:children]
elevate-mediachannel-relay
@@ -607,15 +584,6 @@ ele-jitsi
s2-thetys
sk-tomnext-nc
ch-thetys
-glt-coturn
-glt-meet1
-glt-meet2
-glt-dione
-glt-helene
-glt-calypso
-glt-telesto
-glt-tsdatacop
-glt-thetys
sk-testvm
ch-testvm-prometheus
ch-companion-raspi
diff --git a/spreadspace/glt-jitsi.yml b/spreadspace/glt-jitsi.yml
new file mode 100644
index 00000000..98650ea1
--- /dev/null
+++ b/spreadspace/glt-jitsi.yml
@@ -0,0 +1,19 @@
+---
+- name: Basic Setup
+ hosts: glt-jitsi
+ roles:
+ - role: apt-repo/base
+ - role: core/base
+ - role: core/sshd/base
+ - role: core/zsh
+ - role: core/ntp
+
+- name: Payload Setup
+ hosts: glt-jitsi
+ roles:
+ - role: apt-repo/spreadspace
+ - role: kubernetes/base
+ - role: kubernetes/standalone/base
+ - role: x509/acmetool/base
+ - role: nginx/base
+ - role: apps/jitsi/meet
diff --git a/spreadspace/group_vars/linuxtage.yml b/spreadspace/group_vars/linuxtage.yml
new file mode 100644
index 00000000..b94527a0
--- /dev/null
+++ b/spreadspace/group_vars/linuxtage.yml
@@ -0,0 +1,14 @@
+$ANSIBLE_VAULT;1.2;AES256;spreadspace
+38316365356236666532336235656533346230353564376465316138383565373862346239303833
+3863383666363030633861343064333666636334653065630a626561646239366162323635653565
+38373232326530656131636661613735663931646334383963386266323235356435353830653735
+3934613434633931390a343438613332396436636166393361373934303964646432386162316430
+37356131343961326166376138623938626262616161663064306465623035343339636362376134
+30383636653361333263643237373735626534326533646465313962393263613332303162353238
+34633331393436363564653161363366626666326562396663663865643833333031343431626134
+33653963666230363034366635646638313830633734323633313966383565316439613166376334
+62303937623865373936356363633137333239666631616233306666663638623666626430613738
+30616230346231323762373665633436626630393462633864653637313535353164313735366432
+33646633653839383363646161363532396234343230633664653835613536353737376232646137
+36393664383839653535343763326630343364616135303038353765653664663636383961663538
+6532
diff --git a/spreadspace/host_vars/glt-jitsi.yml b/spreadspace/host_vars/glt-jitsi.yml
new file mode 100644
index 00000000..8e803c51
--- /dev/null
+++ b/spreadspace/host_vars/glt-jitsi.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.2;AES256;spreadspace
+65316230633338643566353130626236393664373432643639663732623138333036396166373939
+6230643239343037373132313737326136356536623638340a633435363337653831383861366138
+39303936653530343036656431656335306239313638373231303139333732633063306564613961
+3833656530316162350a646233356537303338336332303862393737653231666132343863323430
+35336232343639653831393565343565613464306436346332646431333335393966313037363237
+33643263393235303139346633656565303065653730666239383739386365653666396166303930
+66636437393030383137306563366334623862613061643237643537333238386561623638396133
+66636330646562613537333765616562373333633662343763393837336363343135663834656436
+65353531653536643036343336643265326133613165343731363533333038363736363037663666
+30386539663437623832316630616362313032643334383939353830373063633062313231353162
+35346563383633313439386265376631646631303038383466353838653830313135356565366339
+31636165626235346330626263653636666533623037653864383031303835633730373935326139
+37633930326236313430383664343064613033386565313462653139663237306561373864383439
+61646437633035353731663735663136303564623533633931653664623939346636623965393533
+37636564303031363536353032393034383666616463646661336138613862326631343933336435
+31323539633834626664356462363530316162663938383664653434383933366134616462366265
+38643534333762383537633365376361336631323265303734366363623465303861