meissa/c4k-jitsi
6
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity

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

Browse source
This commit is contained in:
Mirco 2023-11-23 15:06:57 +01:00
commit de98e87655
6 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.py
View file

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

4
infrastructure/excalidraw-backend/build.py
View file

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

4
infrastructure/web/build.py
View file

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

2
package.json
View file

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

2
project.clj
View file

@ -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" :description "jitsi c4k-installation package"
:url "https://domaindrivenarchitecture.org" :url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0" :license {:name "Apache License, Version 2.0"

14
src/main/cljc/dda/c4k_jitsi/jitsi.cljc
View file

@ -1,4 +1,5 @@
(ns dda.c4k-jitsi.jitsi (ns dda.c4k-jitsi.jitsi
<<<<<<< HEAD
(:require (:require
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
#?(:cljs [shadow.resource :as rc]) #?(:cljs [shadow.resource :as rc])
@ -10,6 +11,18 @@
[dda.c4k-common.base64 :as b64] [dda.c4k-common.base64 :as b64]
[dda.c4k-common.predicate :as cp] [dda.c4k-common.predicate :as cp]
#?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]]))) #?(: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 ::fqdn cp/fqdn-string?)
(s/def ::issuer cp/letsencrypt-issuer?) (s/def ::issuer cp/letsencrypt-issuer?)
@ -23,7 +36,6 @@
(def auth? (s/keys :req-un [::jvb-auth-password (def auth? (s/keys :req-un [::jvb-auth-password
::jicofo-auth-password ::jicofo-auth-password
::jicofo-component-secret])) ::jicofo-component-secret]))
#?(:cljs #?(:cljs
(defmethod yaml/load-resource :jitsi [resource-name] (defmethod yaml/load-resource :jitsi [resource-name]
(get (inline-resources "jitsi") resource-name))) (get (inline-resources "jitsi") resource-name)))