summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-02-11 22:30:25 +0100
committerChristian Pointner <equinox@spreadspace.org>2022-02-11 22:30:25 +0100
commit9887ba028afc1a94a66b062ff2259131b0d97616 (patch)
tree54f0ddd179eef3085a1ef43ffecb5fb62706838d
parentkubernetes/docker: configure log-driver to rotate log files (diff)
renovate glt-jtsi
-rw-r--r--inventory/group_vars/glt-live-misc/vars.yml2
-rw-r--r--inventory/host_vars/glt-jitsi.yml17
-rw-r--r--inventory/hosts.ini2
-rw-r--r--spreadspace/host_vars/glt-jitsi.yml31
4 files changed, 35 insertions, 17 deletions
diff --git a/inventory/group_vars/glt-live-misc/vars.yml b/inventory/group_vars/glt-live-misc/vars.yml
index c15801e3..4f1862b5 100644
--- a/inventory/group_vars/glt-live-misc/vars.yml
+++ b/inventory/group_vars/glt-live-misc/vars.yml
@@ -5,6 +5,8 @@ install:
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
diff --git a/inventory/host_vars/glt-jitsi.yml b/inventory/host_vars/glt-jitsi.yml
index c9ead024..1f2c104d 100644
--- a/inventory/host_vars/glt-jitsi.yml
+++ b/inventory/host_vars/glt-jitsi.yml
@@ -18,7 +18,7 @@ spreadspace_apt_repo_components:
- container
-kubernetes_version: 1.22.5
+kubernetes_version: 1.23.3
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
kubernetes_standalone_pod_cidr: 192.168.255.0/24
@@ -27,9 +27,22 @@ kubernetes_standalone_cni_variant: with-portmap
jitsi_meet_base_path: /srv/jitsi/meet
-jitsi_meet_version: stable-5390-3
+jitsi_meet_version: stable-6865
jitsi_meet_hostname: jitsi.linuxtage.at
jitsi_meet_p2p_enable: no
+jitsi_meet_require_display_name: yes
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: glt
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 1ad95515..cb0c0f6a 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -146,7 +146,7 @@ glt-live-tug
[glt-live-misc]
glt-coturn host_name=cdn13
-glt-jitsi host_name=cdn12
+glt-jitsi host_name=jitsi
glt-stream host_name=stream
[glt-live-r3]
diff --git a/spreadspace/host_vars/glt-jitsi.yml b/spreadspace/host_vars/glt-jitsi.yml
index f2bfccc2..86667d10 100644
--- a/spreadspace/host_vars/glt-jitsi.yml
+++ b/spreadspace/host_vars/glt-jitsi.yml
@@ -1,15 +1,18 @@
$ANSIBLE_VAULT;1.2;AES256;spreadspace
-64326233353735363136623861323231323363373832363139623530393039363536613635383062
-3931386438316463643239653136393334316364306461350a383938343364636364376530396461
-39386232633264393931383365353262306335353933393433313133366531393634346432313166
-3237623830393537360a333661383330303632306164666164656633623864346436643639663136
-34643461653536326335383162383965366637353666323339356339616131393739326361623335
-66613030376561613165373834636337336631353863613830363930663464383638613334613866
-62346434663866653464366238356336353834396665353736653336396263333139613931373335
-62623965326536343364303163343732363961616335303333663666663961346432396532383132
-62313363303538663762633232663863356638393730643238626533303264373036623435303538
-34633330346634643232653838373961346266613739656136633034386636636439386435643234
-33306565663437303231646134623637353263663964623539363338666539306639333432616365
-62656439353139306665323835636661656532306465626465356334316363343262383036356238
-30616634373964393065336164623037623164386164346564393630633938376139356630666233
-3065356235613039346266386634646636393234666135643938
+38643264333664393735346437303731653234353035363865353963336361643634633762666639
+6338623461386263643839663165636334663734613938650a316434383038633664383937643137
+64623034333732643461316163303138616633353666316433613738336235323530646233373437
+3562613134613365320a653863313838326237306566336339376136313332376634626135663239
+37303232653230306463346166376464316232386638306562653937323562666162366331646234
+35333666393563336164323566353738323861333965343965333438663032303131616265333039
+34656662366130316261306536613435393834366663343763643137633030303238613538613061
+31376531366338323730353366383130616630393635386164326662646566363331636430343338
+32393737396532313261323032613766313532383536636132643166656162333834333937626663
+64323937633738353838633565366666303438333766623331643766366333653534333838643864
+30363663643836663634326230616333626265666335633863326134626635346362346261383063
+66303539663335633265363737623966313665376265613638383265356635656662663965363234
+37313230633539333231343466653630353062636164373137383064333134633363343264656262
+32633361663466306638663463383362303365303662303663386234626234363163373162326630
+38383830313434306332393334306532313363646236336438316432633364323838316232653265
+37313334343232633634666564383666646237613634313439336236336335343466616630373337
+34393039613131656437303736353139346439663538323237643930343736323438