Merge branch 'main' of ssh://repo.prod.meissa.de:2222/meissa/c4k-jitsi

build.py

@@ -18,6 +18,7 @@ def initialize(project):
         "stage": "notused",
         "project_root_path": PROJECT_ROOT_PATH,
         "build_types": [],
+        "release_artifacts": ["target/uberjar/c4k-jitsi-standalone.jar"],
         "mixin_types": ["RELEASE"],
         "release_primary_build_file": "project.clj",
         "release_secondary_build_files": [

infrastructure/excalidraw-backend/build.py

@@ -4,9 +4,9 @@ from pybuilder.core import task, init
 from ddadevops import *
 
 name = "c4k-jitsi"
-MODULE = "excalidraw-testbackend"
+MODULE = "excalidraw-backend"
 PROJECT_ROOT_PATH = "../.."
-version = "1.0.1-SNAPSHOT"
+version = "1.6.1-SNAPSHOT"
 
 
 @init

infrastructure/web/build.py

@@ -4,9 +4,9 @@ from pybuilder.core import task, init
 from ddadevops import *
 
 name = "c4k-jitsi"
-MODULE = "webtest"
+MODULE = "web"
 PROJECT_ROOT_PATH = "../.."
-version = "1.0.1-SNAPSHOT"
+version = "1.6.1-SNAPSHOT"
 
 
 @init

package.json

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

project.clj

@@ -1,4 +1,4 @@
-(defproject org.domaindrivenarchitecture/c4k-jitsi "1.6.0-SNAPSHOT"
+(defproject org.domaindrivenarchitecture/c4k-jitsi "1.6.1-SNAPSHOT"
   :description "jitsi c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"

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

@@ -1,4 +1,5 @@
 (ns dda.c4k-jitsi.jitsi
+<<<<<<< HEAD
  (:require
   [clojure.spec.alpha :as s]
   #?(:cljs [shadow.resource :as rc])
@@ -10,6 +11,18 @@
   [dda.c4k-common.base64 :as b64]
   [dda.c4k-common.predicate :as cp]
   #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
+=======
+  (:require
+   [clojure.spec.alpha :as s]
+   #?(:clj [orchestra.core :refer [defn-spec]]
+      :cljs [orchestra.core :refer-macros [defn-spec]])
+   [dda.c4k-common.yaml :as yaml]
+   [dda.c4k-common.common :as cm]
+   [dda.c4k-common.ingress :as ing]
+   [dda.c4k-common.base64 :as b64]
+   [dda.c4k-common.predicate :as cp]
+   #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
+>>>>>>> 89de4ed0a5b1247d387b28aebbbd357599264480
 
 (s/def ::fqdn cp/fqdn-string?)
 (s/def ::issuer cp/letsencrypt-issuer?)
@@ -23,11 +36,10 @@
 (def auth? (s/keys :req-un [::jvb-auth-password 
                             ::jicofo-auth-password 
                             ::jicofo-component-secret]))
-
-#?(:cljs
+#?(:cljs 
    (defmethod yaml/load-resource :jitsi [resource-name]
-     (get (inline-resources "jitsi") resource-name)))
-     
+           (get (inline-resources "jitsi") resource-name)))
+
 (defn-spec generate-ingress-web cp/map-or-seq?
   [config config?]
   (ing/generate-ingress-and-cert