diff options
| -rw-r--r-- | dan/ele-jitsi.yml | 1 | ||||
| -rw-r--r-- | dan/host_vars/ele-jitsi.yml | 44 | ||||
| -rw-r--r-- | files/chaos-at-home/bind-zones/db.elev8.at | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ele-jitsi.yml | 9 | ||||
| -rw-r--r-- | inventory/host_vars/glt-meet1.yml | 5 | ||||
| -rw-r--r-- | inventory/host_vars/glt-meet2.yml | 5 | ||||
| -rw-r--r-- | inventory/host_vars/sk-cloudio/jitsi.yml | 2 | ||||
| -rw-r--r-- | inventory/hosts.ini | 1 | ||||
| -rw-r--r-- | roles/apps/jitsi/meet/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/apps/jitsi/meet/templates/pod-spec.yml.j2 | 2 |
10 files changed, 39 insertions, 37 deletions
diff --git a/dan/ele-jitsi.yml b/dan/ele-jitsi.yml index 68d14576..94fa8301 100644 --- a/dan/ele-jitsi.yml +++ b/dan/ele-jitsi.yml @@ -17,3 +17,4 @@ - role: x509/acmetool/base - role: nginx/base - role: apps/jitsi/meet + - role: monitoring/prometheus/exporter diff --git a/dan/host_vars/ele-jitsi.yml b/dan/host_vars/ele-jitsi.yml index a54c6a1e..e319799c 100644 --- a/dan/host_vars/ele-jitsi.yml +++ b/dan/host_vars/ele-jitsi.yml @@ -1,23 +1,23 @@ $ANSIBLE_VAULT;1.2;AES256;dan -65303136363338323135653236313236333162633636316464643637613962373765316132666666 -6331333363353630353063373166346531323463626564370a643561393031343039376262373334 -35373331376566346538653439373666643130623163653536623934383132306430343035616137 -3931373264666431300a326439636266666264373437653034326537346432373339623236656162 -37333364363932303639353239623736386234326162313439646532656337633861623539386538 -65646531383331623062376364326432633364633136643064326135386132383234313038303339 -32623638303765383238616336666531316538343337376633383138613035386266393537363238 -37636133343731626561383936383431633438336138616139336632306163643834356631343166 -30643563366536353166633930646166353633366365336638373036666337333134396335333664 -32626563626131383937343562656131323537363433636635643262663364316534396130336265 -30646466653737363166356461366334373739373336373361343632386332373966383131613833 -61333061666663343765613466303032386563373930326163623737643338623737316232616532 -61313661336661653637353763306133396336646533363731396139393130303765373464336164 -36373939656366623233363236326666346336366362613334386163346134613562346237333761 -66333638366533303931663734323031303866613761613331333831623666613733373465626361 -35303037386331326635373263303664663837383239623765653564653131323335396630363631 -39633066386265396633663532363063636261316336303138356239373237333138393963613766 -39313262303865626463353937353366613433393430653835383636666363623835323938623631 -30626337376639353631353730366632376233343862343034376431366163396232643631633531 -32396338646633643638633934653865633763373630373039353234393432643431643332353234 -32636438326462316165356332353131336630373035343566323662626335663833386633613862 -3763333639666661633335323931346164636464666132316331 +35303430373832396233653532326662346563376530353639663766626235316435323430656639 +3963666566636536356263306634336663356264353130650a303861663162363032656332333531 +32653461646439623237356664663161326566353032663030343439656134636432363530326537 +3132346431393663610a393463316135363432353762663865396663303836373166646434386361 +35343966366165393334356361666338326139363435373066303939623335313265363733626263 +66656431323661366337643766376530663133663038316533353635656130323036653434303265 +32333737386165626634653438366261343133613062303961326162646130383462363563303636 +37643331353539376333343239373937343332656635323262646163346633646662376366313635 +62643639643263643261353862303431663132663837633566353739626133383434353565636663 +61386538653834646435313261643763306464326564656266323631653438326233373963366462 +38653033346161613465376134306530663737646230303962633163616439656539326333303162 +33656433373361616261316334653261353464336464373961353935363538323732356366323836 +32326532633665666363383436306361386536333730356262623864636666623735326461346136 +30343065626165376334363363393831633262396663663530356237303766353636626262396461 +66356633633262636365363136373566623937383762363862666536353537633832303837326433 +38356364336435376266623364336337376235333566636231343338393631666439333039323063 +39326234363432646333386562313366376134376464633166316363613835623561396332646131 +65326437333566306638643563333534633964343563303430666331646635316166366533383734 +63386562313538356361653237396665393634383338626465633563613836333233636233656463 +63343736646662656662616532386432323966376432356134346131653830393438643137663461 +39623338383337383439336561306164353763343862366265653134666639643961313936366639 +3630353132383635393736336464323964326536363334613731 diff --git a/files/chaos-at-home/bind-zones/db.elev8.at b/files/chaos-at-home/bind-zones/db.elev8.at index 416af767..6c5d1414 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 ( - 2023022200 + 2023022201 1h 5m 30d @@ -32,7 +32,7 @@ _turns._udp SRV 10 0 443 turn.elev8.at. _turns._tcp SRV 10 0 443 turn.elev8.at. mumble A 162.55.59.151 -remote A 167.235.29.150 +remote A 5.75.236.59 meet CNAME cloudio.skillz.biz. testvm A 178.63.180.143 diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml index b6aa0db4..94305b40 100644 --- a/inventory/host_vars/ele-jitsi.yml +++ b/inventory/host_vars/ele-jitsi.yml @@ -22,6 +22,7 @@ kubelet_storage: spreadspace_apt_repo_components: - container + - prometheus ssh_users_root: - equinox @@ -30,16 +31,15 @@ ssh_users_root: acme_directory_server: "{{ acme_directory_server_le_live_v2 }}" -kubernetes_version: 1.24.2 +kubernetes_version: 1.26.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 -kubernetes_standalone_pod_cidr: 192.168.255.0/24 kubernetes_standalone_cni_variant: with-portmap jitsi_meet_base_path: /srv/jitsi/meet -jitsi_meet_version: stable-7001 +jitsi_meet_version: stable-8252 jitsi_meet_hostname: remote.elev8.at jitsi_meet_p2p_enable: no @@ -74,3 +74,6 @@ jitsi_meet_streamui: # operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}" image_tag: latest default_control_room: lashuu8O + + +prometheus_scrape_endpoint: "{{ ansible_default_ipv4.address }}:9999" diff --git a/inventory/host_vars/glt-meet1.yml b/inventory/host_vars/glt-meet1.yml index d554dba1..ea860b04 100644 --- a/inventory/host_vars/glt-meet1.yml +++ b/inventory/host_vars/glt-meet1.yml @@ -18,16 +18,15 @@ spreadspace_apt_repo_components: - container -kubernetes_version: 1.23.5 +kubernetes_version: 1.26.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 -kubernetes_standalone_pod_cidr: 192.168.255.0/24 kubernetes_standalone_cni_variant: with-portmap jitsi_meet_base_path: /srv/jitsi/meet -jitsi_meet_version: stable-7001 +jitsi_meet_version: stable-8252 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 1346c389..b86d0103 100644 --- a/inventory/host_vars/glt-meet2.yml +++ b/inventory/host_vars/glt-meet2.yml @@ -18,16 +18,15 @@ spreadspace_apt_repo_components: - container -kubernetes_version: 1.23.5 +kubernetes_version: 1.26.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 -kubernetes_standalone_pod_cidr: 192.168.255.0/24 kubernetes_standalone_cni_variant: with-portmap jitsi_meet_base_path: /srv/jitsi/meet -jitsi_meet_version: stable-7001 +jitsi_meet_version: stable-8252 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 73c8cd14..c2692e80 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-7001 +jitsi_meet_version: stable-8252 jitsi_meet_hostname: meet.elevate.at jitsi_meet_p2p_enable: no diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 2843c715..37cec5e5 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -457,6 +457,7 @@ ele-router-hmtsaal ele-router-emc ele-router-orpheum ele-thetys +ele-jitsi [promzone-elevate-festival:children] ele-ap ele-ups diff --git a/roles/apps/jitsi/meet/defaults/main.yml b/roles/apps/jitsi/meet/defaults/main.yml index f60e8ad9..cb27106a 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-5963 +# jitsi_meet_version: stable-8252 jitsi_meet_inst_name: "{{ jitsi_meet_hostname }}" # jitsi_meet_hostname: meet.example.com @@ -31,7 +31,6 @@ jitsi_meet_timezone: Europe/Vienna ### generate these using: openssl rand -hex 16 # jitsi_meet_secrets: -# jicofo_component_secret: "" ### only needed for versions older than stable-5765-1 # jicofo_auth_password: "" # jvb_auth_password: "" # streamuidisplay_auth_password: "" ### only needed if streamui is enabled diff --git a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 index c6fed105..1e2db862 100644 --- a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 +++ b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 @@ -244,7 +244,7 @@ containers: {# TODO: remove environment variable for TCP harvester once all instances run on stable-7001 or newer #} - name: JVB_TCP_HARVESTER_DISABLED value: "true" - - name: DOCKER_HOST_ADDRESS + - name: JVB_ADVERTISE_IPS value: "{{ external_ip | default(ansible_default_ipv4.address) }}" - name: JVB_WS_SERVER_ID value: "127.0.0.1" |