From 208d5f414c361417ca5cf3634b8c0220fc8f40c9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 19 Feb 2024 15:24:14 +0100 Subject: update jitsi meet --- dan/host_vars/ele-jitsi.yml | 50 ++++++++++++------------- dan/sk-testvm.yml | 2 +- files/chaos-at-home/bind-zones/db.elev8.at | 30 +++++++-------- inventory/host_vars/ele-coturn.yml | 2 +- inventory/host_vars/ele-jitsi.yml | 4 +- inventory/host_vars/glt-coturn.yml | 2 +- inventory/host_vars/glt-meet1.yml | 2 +- inventory/host_vars/glt-meet2.yml | 2 +- inventory/host_vars/sk-cloudio/jitsi.yml | 2 +- roles/apps/jitsi/meet/defaults/main.yml | 11 +++++- roles/apps/jitsi/meet/templates/pod-spec.yml.j2 | 12 ++++++ roles/apps/mumble/defaults/main.yml | 2 +- 12 files changed, 71 insertions(+), 50 deletions(-) diff --git a/dan/host_vars/ele-jitsi.yml b/dan/host_vars/ele-jitsi.yml index 068a36af..fb36ca68 100644 --- a/dan/host_vars/ele-jitsi.yml +++ b/dan/host_vars/ele-jitsi.yml @@ -1,26 +1,26 @@ $ANSIBLE_VAULT;1.2;AES256;dan -30623166373661323539383836396233396539623233386264613463376338326630353361386566 -6361316235393565636431643230626461613166333633650a343464633464623733393134386332 -35396230383336653537633236336130663366636233366335663537363135633834376632373137 -3534363639623966320a656537663435306430376566373565393564646539333631303565363236 -39663761633365653739343135613461396335353130363932616261646266653039316434613464 -61353532396535366462633838353339386336613332353061323364363763663163616662356433 -34646432663830343433643432623934393533366634636461363136386632613833386437653237 -65626534366539363162653030656131623163373736323039396164623233343832363339383134 -39356131663766373739353562356238653635663234383765653062366432316437306161353031 -33386466373665653863383830333537383732323164326466353561383461383062376234386564 -33353363376631643761366335356339373261633030373165653134653136363166363634343766 -66363036653039333064363361383661336634386663353763653264353437373336653031313066 -30306331356135383036343362633362646135616234613761356262383162646232643063626535 -31623462373030623930363933656663646266643166663664623266343531666366373334623439 -34666131333034653664393464323464343366613665326462336133306334626639323966333836 -35323637636430363437386664613037666636343931363330653235313562636163623730353830 -31613035356534666131316461353736666435356562653333393635363530643661363931323663 -63323835336336313263353762626264623231663438376163643561373962393136383562666465 -30656530326162633334623563323163663564646231386561316161613362356637336138613461 -64386537353361383831666333306335646262616437636664373663343531326435323636636564 -63653238623931383663343931616437613237633964613239636362666166343664363863626137 -32396136323335666330306339373434663831623264353737313330653864613133656435653362 -36386535653265303739623432623837326662333933346664613461323431343462633232326534 -66333934316338626131343333386536613365646639363239653665383364356234323837333463 -61633435663761376465373931383435636334316366376434303036646634643965 +38373939316137333037336333356362653866633962323666643232323230333631666463633038 +3434653263316531363431363164623637663862616439630a343632306266646339363864306333 +33643433346637346366323036306537346633386461313861636662303138363265636630643337 +3831663830316234350a346432613830346533393262383139393038626466326231383833373261 +64303738336630623234303363373162393933636634646634646566353466306438376639343834 +31346337646435623838326231393664306232326637323634363031303139383433333263323433 +61626134636561653435663831326261323165353062366564616131383230323832333832366331 +34623237356433306661396566366235396536323436626364613666313037306662376463393836 +64326236616232356234326638373161366138316664303035623732313138643438653335326533 +33656432616234373234663637333463636635323464326364343337623930393661623262333564 +61333439363361666633373033623062333836373366353764366264646662343738363431343030 +61336661353066633033636263656231396461323637356531303331363963633166643137616531 +38613231613335613739386361666337366161343562613539653938643961356537613938356462 +32623162393530623261323163613930653862636332383138303664613434663039663633353163 +30356136666536623764373430343235373334343732396338313261303838663934616533313437 +35306538373435373637343764353539323538373538343766386236613630363736303763653633 +61653834656135666536646438323834653930623363306466313539633137613138333537663163 +30396332313962386136633961386665366232376336343833666562643139613538316166373961 +64396434353730323764643463616137376161323565626332356665333332303439333935333238 +36643639373739343237643633666232373639313336643264663239633462306462613736356136 +35303464613431396636666631383731383966633138373166643266643730363131616332313737 +63326166613030356538373064393039626230323961643536656166373634346331376237353237 +62623866306234356662336263666531656562363134343333376561306365386138653765653432 +65613832623836656531623835383738656662616138653730323764343437393634383666623966 +3563 diff --git a/dan/sk-testvm.yml b/dan/sk-testvm.yml index bf7c41dd..74ba2053 100644 --- a/dan/sk-testvm.yml +++ b/dan/sk-testvm.yml @@ -82,7 +82,7 @@ auth_request_set $cookie $upstream_http_set_cookie; add_header Set-Cookie $cookie; # - role: apps/mumble - # mumble_version: v1.4.274-4 + # mumble_version: v1.4.287-4 # mumble_instance: spreadspace # mumble_hostnames: # - test.spreadspace.org diff --git a/files/chaos-at-home/bind-zones/db.elev8.at b/files/chaos-at-home/bind-zones/db.elev8.at index 3d367728..eaf7e516 100644 --- a/files/chaos-at-home/bind-zones/db.elev8.at +++ b/files/chaos-at-home/bind-zones/db.elev8.at @@ -1,7 +1,7 @@ $TTL 1h @ SOA ns0.chaos-at-home.org. hostmaster ( - 2024021701 + 2024021900 1h 5m 30d @@ -19,20 +19,20 @@ office CNAME cloudio.skillz.biz. bs CNAME cloudio.skillz.biz. wikijs CNAME cloudio.skillz.biz. -stun A 162.55.59.151 -_stun._udp SRV 10 0 3478 stun.elev8.at. -_stun._tcp SRV 10 0 3478 stun.elev8.at. -_stuns._udp SRV 10 0 443 stun.elev8.at. -_stuns._tcp SRV 10 0 443 stun.elev8.at. - -turn A 162.55.59.151 -_turn._udp SRV 10 0 3478 turn.elev8.at. -_turn._tcp SRV 10 0 3478 turn.elev8.at. -_turns._udp SRV 10 0 443 turn.elev8.at. -_turns._tcp SRV 10 0 443 turn.elev8.at. - -mumble A 89.106.215.20 -remote A 5.75.236.59 +;stun A 162.55.59.151 +;_stun._udp SRV 10 0 3478 stun.elev8.at. +;_stun._tcp SRV 10 0 3478 stun.elev8.at. +;_stuns._udp SRV 10 0 443 stun.elev8.at. +;_stuns._tcp SRV 10 0 443 stun.elev8.at. +; +;turn A 162.55.59.151 +;_turn._udp SRV 10 0 3478 turn.elev8.at. +;_turn._tcp SRV 10 0 3478 turn.elev8.at. +;_turns._udp SRV 10 0 443 turn.elev8.at. +;_turns._tcp SRV 10 0 443 turn.elev8.at. + +mumble A 159.69.5.123 +remote A 159.69.5.123 meet CNAME cloudio.skillz.biz. testvm A 178.63.180.143 diff --git a/inventory/host_vars/ele-coturn.yml b/inventory/host_vars/ele-coturn.yml index 45eb87c1..e8a9531a 100644 --- a/inventory/host_vars/ele-coturn.yml +++ b/inventory/host_vars/ele-coturn.yml @@ -48,7 +48,7 @@ coturn_tls: certificate_provider: "{{ acme_client }}" -mumble_version: v1.4.274-4 +mumble_version: v1.4.287-4 mumble_instance: elev8.at mumble_hostnames: - mumble.elev8.at diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml index 8a2b3484..7e059879 100644 --- a/inventory/host_vars/ele-jitsi.yml +++ b/inventory/host_vars/ele-jitsi.yml @@ -40,7 +40,7 @@ kubernetes_standalone_cni_variant: with-portmap jitsi_meet_base_path: /srv/jitsi/meet -jitsi_meet_version: stable-8252 +jitsi_meet_version: stable-9258 jitsi_meet_hostname: remote.elev8.at jitsi_meet_p2p_enable: no @@ -77,7 +77,7 @@ jitsi_meet_streamui: default_control_room: lashuu8O -mumble_version: v1.4.274-4 +mumble_version: v1.4.287-4 mumble_instance: elev8.at mumble_hostnames: - mumble.elev8.at diff --git a/inventory/host_vars/glt-coturn.yml b/inventory/host_vars/glt-coturn.yml index 483307c9..8e404162 100644 --- a/inventory/host_vars/glt-coturn.yml +++ b/inventory/host_vars/glt-coturn.yml @@ -40,7 +40,7 @@ coturn_tls: certificate_provider: "{{ acme_client }}" -mumble_version: v1.4.274-4 +mumble_version: v1.4.287-4 mumble_instance: linuxtage.at mumble_hostnames: - mumble.linuxtage.at diff --git a/inventory/host_vars/glt-meet1.yml b/inventory/host_vars/glt-meet1.yml index 8218de9e..8188172e 100644 --- a/inventory/host_vars/glt-meet1.yml +++ b/inventory/host_vars/glt-meet1.yml @@ -28,7 +28,7 @@ kubernetes_standalone_cni_variant: with-portmap jitsi_meet_base_path: /srv/jitsi/meet -jitsi_meet_version: stable-8252 +jitsi_meet_version: stable-9258 jitsi_meet_hostname: meet1.linuxtage.at jitsi_meet_p2p_enable: no diff --git a/inventory/host_vars/glt-meet2.yml b/inventory/host_vars/glt-meet2.yml index a643d115..2244f1f3 100644 --- a/inventory/host_vars/glt-meet2.yml +++ b/inventory/host_vars/glt-meet2.yml @@ -28,7 +28,7 @@ kubernetes_standalone_cni_variant: with-portmap jitsi_meet_base_path: /srv/jitsi/meet -jitsi_meet_version: stable-8252 +jitsi_meet_version: stable-9258 jitsi_meet_hostname: meet2.linuxtage.at jitsi_meet_p2p_enable: no diff --git a/inventory/host_vars/sk-cloudio/jitsi.yml b/inventory/host_vars/sk-cloudio/jitsi.yml index a352821a..082497f6 100644 --- a/inventory/host_vars/sk-cloudio/jitsi.yml +++ b/inventory/host_vars/sk-cloudio/jitsi.yml @@ -1,7 +1,7 @@ --- jitsi_meet_base_path: /srv/storage/jitsi/meet -jitsi_meet_version: stable-8319 +jitsi_meet_version: stable-9258 jitsi_meet_hostname: meet.elevate.at jitsi_meet_p2p_enable: no diff --git a/roles/apps/jitsi/meet/defaults/main.yml b/roles/apps/jitsi/meet/defaults/main.yml index cb27106a..e383c776 100644 --- a/roles/apps/jitsi/meet/defaults/main.yml +++ b/roles/apps/jitsi/meet/defaults/main.yml @@ -1,7 +1,7 @@ --- jitsi_meet_base_path: /srv/jitsi/meet -# jitsi_meet_version: stable-8252 +# jitsi_meet_version: stable-9258 jitsi_meet_inst_name: "{{ jitsi_meet_hostname }}" # jitsi_meet_hostname: meet.example.com @@ -13,6 +13,15 @@ jitsi_meet_p2p_enable: yes jitsi_meet_timezone: Europe/Vienna +jitsi_meet_video_codecs: + - AV1 + - H264 + - VP8 + - VP9 + +jitsi_meet_audio_codecs: + - OPUS_RED + # jitsi_meet_resolution: # default: # width: 1280 diff --git a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 index 1e2db862..4658ebf8 100644 --- a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 +++ b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 @@ -55,6 +55,15 @@ containers: - name: TZ value: {{ jitsi_meet_timezone }} +{% for codec in jitsi_meet_video_codecs %} + - name: ENABLE_CODEC_{{ codec }} + value: "1" +{% endfor %} +{% for codec in jitsi_meet_audio_codecs %} + - name: ENABLE_CODEC_{{ codec }} + value: "1" +{% endfor %} + - name: prosody image: "jitsi/prosody:{{ jitsi_meet_version }}" resources: @@ -199,6 +208,9 @@ containers: {% endif %} {% endif %} + - name: COLIBRI_WEBSOCKET_REGEX + value: "127\\.0\\.0\\.1" + - name: jvb image: "jitsi/jvb:{{ jitsi_meet_version }}" resources: diff --git a/roles/apps/mumble/defaults/main.yml b/roles/apps/mumble/defaults/main.yml index c9cd9db3..3af66d60 100644 --- a/roles/apps/mumble/defaults/main.yml +++ b/roles/apps/mumble/defaults/main.yml @@ -3,7 +3,7 @@ mumble_uid: 910 mumble_gid: 910 mumble_base_path: /srv/mumble -# mumble_version: v1.4.274-4 +# mumble_version: v1.4.287-4 # mumble_instance: example.com # mumble_hostnames: # - mumble.example.com -- cgit v1.2.3