bump version to: 3.0.3-SNAPSHOT

Reviewed-on: #6

README.md

@@ -5,11 +5,19 @@
 
 ## Purpose
 
-c4k-jitsi provides a k8s deployment for jitsi containing:
+c4k-jitsi provides a k8s deployment for jitsi containing [see also Jitsi Architecture](https://jitsi.github.io/handbook/docs/architecture/)
-* jitsi
+* jitsi-web
+* jvb
+* jicofo
+* prosody
+* etherpad for shared documents
+* excalidraw for shared whiteboards
+* coturn as stun server
+* moderator-election as tool for electing the next moderator
 * ingress having a letsencrypt managed certificate
+* monitoring connected to grafana cloud
 
-The package aims to a low load sceanrio.
+The package is intended for a low-load scenario.
 
 ## Status
 

doc/SetupOnHetzner.md

@@ -17,10 +17,10 @@ resource "aws_s3_bucket" "backup" {
   }
 }
 
-resource "hcloud_server" "jitsi_09_2021" {
+resource "hcloud_server" "jitsi_2025_02" {
   name        = "the name"
-  image       = "ubuntu-20.04"
+  image       = "ubuntu-24.04"
-  server_type = "cx31"
+  server_type = "cx32"
   location    = "fsn1"
   ssh_keys    = ...
 
@@ -29,31 +29,30 @@ resource "hcloud_server" "jitsi_09_2021" {
   }
 }
 
-resource "aws_route53_record" "v4_neu" {
+resource "aws_route53_record" "v4" {
+  for_each ["jitsi", "stun.jitsi", "excalidraw.jitsi", "etherpad.jitsi"]
   zone_id = the_dns_zone
-  name    = "jitsi-neu"
+  name    = each.key
   type    = "A"
   ttl     = "300"
-  records = [hcloud_server.jitsi_09_2021.ipv4_address]
+  records = [hcloud_server.jitsi_2025_01.ipv4_address]
 }
 
 output "ipv4" {
-  value = hcloud_server.jitsi_09_2021.ipv4_address
+  value = hcloud_server.jitsi_2025_01.ipv4_address
 }
 
 ```
 
 ## k8s minicluster
 
-For k8s installation we use our [provs](https://repo.prod.meissa.de/meissa/provs) with the following configuation:
+For k8s installation we use our [provs](https://repo.prod.meissa.de/meissa/provs) with the following configuration:
 
 
 ```
-{:user :k8s
+{:fqdn "fqdn-from-above"
- :k8s {:external-ip "ip-from-above"}
+ :node {:ipv4 "ip-from-above"}
- :cert-manager :letsencrypt-prod-issuer
+ :certmanager {:email "admin-email" :letsencryptEndpoint "prod"}}
- :persistent-dirs ["postgres"]
- }
 ```
 
 ## kubectl apply c4k-jitsi
@@ -67,7 +66,6 @@ c4k-jitsi config.edn auth.edn | kubectl apply -f -
 with the following config.edn:
 
 ```
-{:fqdn "the-fqdn-from aws_route53_record.v4_neu"
+{:fqdn "fqdn-from-above"
- :postgres-data-volume-path "/var/postgres"         ;; Volume was configured at dda-k8s-crate, results in a PersistentVolume definition.
  :issuer "prod" }
 ```

infrastructure/excalidraw/build.py

@@ -6,7 +6,7 @@ from ddadevops import *
 name = "c4k-jitsi"
 MODULE = "excalidraw"
 PROJECT_ROOT_PATH = "../.."
-version = "3.0.1"
+version = "3.0.3-dev"
 
 
 @init

package.json

@@ -2,7 +2,7 @@
     "name": "c4k-jitsi",
     "description": "Generate c4k yaml for a jitsi deployment.",
     "author": "meissa GmbH",
-    "version": "3.0.1",
+    "version": "3.0.3-SNAPSHOT",
     "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jitsi#readme",
     "repository": "https://www.npmjs.com/package/c4k-jitsi",
     "license": "APACHE2",

project.clj

@@ -1,10 +1,10 @@
-(defproject org.domaindrivenarchitecture/c4k-jitsi "3.0.1"
+(defproject org.domaindrivenarchitecture/c4k-jitsi "3.0.3-SNAPSHOT"
   :description "jitsi c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"
             :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
   :dependencies [[org.clojure/clojure "1.12.0"]
-                 [org.clojure/tools.reader "1.5.0"]
+                 [org.clojure/tools.reader "1.5.1"]
                  [org.domaindrivenarchitecture/c4k-common-clj "9.0.1"]
                  [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
   :target-path "target/%s/"
@@ -24,9 +24,9 @@
                        :main dda.c4k-jitsi.uberjar
                        :uberjar-name "c4k-jitsi-standalone.jar"
                        :dependencies [[org.clojure/tools.cli "1.1.230"]
-                                      [ch.qos.logback/logback-classic "1.5.16"
+                                      [ch.qos.logback/logback-classic "1.5.17"
                                        :exclusions [com.sun.mail/javax.mail]]
-                                      [org.slf4j/jcl-over-slf4j "2.0.16"]
+                                      [org.slf4j/jcl-over-slf4j "2.0.17"]
                                       [com.github.clj-easy/graal-build-time "1.0.5"]]}}
   :release-tasks [["test"]
                   ["vcs" "assert-committed"]

src/main/cljc/dda/c4k_jitsi/core.cljc

@@ -39,6 +39,7 @@
            (jitsi/jicofo-config resolved-config)
            (jitsi/web-config resolved-config)
            (jitsi/jvb-config resolved-config)
+           ;not yet working, needs fix
            ;(jitsi/jibri-config resolved-config)
            (jitsi/restart-config resolved-config)
            (jitsi/etherpad-config resolved-config)
@@ -65,6 +66,11 @@
                                             :service-port 80
                                             :fqdns [(str "moderator-elector." (:fqdn resolved-config))]}
                                            resolved-config))
+           (ing/generate-ingress-and-cert (merge
+                                           {:service-name "coturn-turn-tcp"
+                                            :service-port 3478
+                                            :fqdns [(str "stun." (:fqdn resolved-config))]}
+                                           resolved-config))
            (when (:contains? resolved-config :mon-cfg)
              (mon/generate-config)))))))
 

src/main/cljc/dda/c4k_jitsi/jitsi.cljc

@@ -40,7 +40,8 @@
     [(load-and-adjust-namespace "jitsi/prosody-config-serviceaccount.yaml" namespace)
      (->
       (load-and-adjust-namespace "jitsi/prosody-config-common-cm.yaml" namespace)
-      (cm/replace-all-matching "JITSI_FQDN" fqdn))
+      (cm/replace-all-matching "JITSI_FQDN" fqdn)
+      (cm/replace-key-value :STUN_HOST (str "stun." fqdn)))
      (load-and-adjust-namespace "jitsi/prosody-config-default-cm.yaml" namespace)
      (load-and-adjust-namespace "jitsi/prosody-config-envs-cm.yaml" namespace)
      (load-and-adjust-namespace "jitsi/prosody-config-init-cm.yaml" namespace)
@@ -87,6 +88,7 @@
      (-> 
       (load-and-adjust-namespace "jitsi/web-config-envs-cm.yaml" namespace)
       (cm/replace-key-value :XMPP_BOSH_URL_BASE (str "http://prosody." namespace ".svc.cluster.local:5280"))
+      (cm/replace-key-value :P2P_STUN_SERVERS (str "stun." fqdn ":443"))
       (cm/replace-key-value :ETHERPAD_PUBLIC_URL (str "https://etherpad." fqdn "/p/"))
       (cm/replace-key-value :WHITEBOARD_COLLAB_SERVER_PUBLIC_URL (str "https://excalidraw." fqdn))
       )

src/main/resources/jitsi/coturn-config-tcp-service.yaml

@@ -9,7 +9,6 @@ metadata:
     metallb.universe.tf/allow-shared-ip: "shared-ip-service-group"
     metallb.universe.tf/address-pool: public
 spec:
-  type: LoadBalancer
   ports:
     - name: turn-tcp
       port: 3478

src/main/resources/jitsi/coturn-config-udp-service.yaml

@@ -9,7 +9,6 @@ metadata:
     metallb.universe.tf/allow-shared-ip: "shared-ip-service-group"
     metallb.universe.tf/address-pool: public
 spec:
-  type: LoadBalancer
   ports:
     - name: turn-udp
       port: 3478

src/main/resources/jitsi/jvb-config-deployment.yaml

@@ -21,6 +21,11 @@ spec:
       serviceAccountName: jitsi-meet
       securityContext:
         {}
+      initContainers:
+        - name: wait-for-prosody
+          image: curlimages/curl:latest
+          command: ["/bin/sh","-c"]
+          args: ["while [ $(curl -sw '%{http_code}' http://prosody:5280 -o /dev/null) -ne 200 ]; do sleep 5; echo 'Waiting for the prosody...'; done"]
       containers:
         - name: jitsi-meet
           securityContext:

src/main/resources/jitsi/prosody-config-common-cm.yaml

@@ -22,4 +22,6 @@ data:
   ENABLE_XMPP_WEBSOCKET: 'true'
   ENABLE_RECORDING: "true"
   ENABLE_FILE_RECORDING_SERVICE_SHARING: "true"
-  TZ: 'Europe/Berlin'
+  TZ: 'Europe/Berlin'
+  STUN_HOST: STUN_FQDN
+  STUN_PORT: "443"

src/main/resources/jitsi/web-config-envs-cm.yaml

@@ -12,9 +12,6 @@ data:
   JICOFO_AUTH_USER: focus
   XMPP_BOSH_URL_BASE: REPLACE_ME
   DEFAULT_LANGUAGE: de
-  RESOLUTION: "480"
+  P2P_STUN_SERVERS: REPLACE_ME
-  RESOLUTION_MIN: "240"
-  RESOLUTION_WIDTH: "853"
-  RESOLUTION_WIDTH_MIN: "427"
   ETHERPAD_PUBLIC_URL: REPLACE_ME
   WHITEBOARD_COLLAB_SERVER_PUBLIC_URL: REPLACE_ME

src/test/cljc/dda/c4k_jitsi/core_test.cljc

@@ -17,7 +17,7 @@
   (is (s/valid? cut/auth? (yaml/load-as-edn "jitsi-test/valid-auth.yaml"))))
 
 (deftest test-whole-generation
-  (is (= 63
+  (is (= 65
          (count
           (cut/config-objects
            (yaml/load-as-edn "jitsi-test/valid-config.yaml")))))

src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc

@@ -47,7 +47,9 @@
            :ENABLE_XMPP_WEBSOCKET "true",
            :ENABLE_RECORDING "true",
            :ENABLE_FILE_RECORDING_SERVICE_SHARING "true",
-           :TZ "Europe/Berlin"}}
+           :TZ "Europe/Berlin"
+           :STUN_HOST "stun.xy.xy.xy",
+           :STUN_PORT "443"}}
          (second (cut/prosody-config
                   {:fqdn "xy.xy.xy"
                    :namespace "jitsi"}))))