diff --git a/src/main/cljc/dda/c4k_jitsi/core.cljc b/src/main/cljc/dda/c4k_jitsi/core.cljc index 916ca2d..ffa0659 100644 --- a/src/main/cljc/dda/c4k_jitsi/core.cljc +++ b/src/main/cljc/dda/c4k_jitsi/core.cljc @@ -35,10 +35,12 @@ (jitsi/generate-web-service) (jitsi/generate-etherpad-service) (jitsi/generate-excalidraw-backend-service) + (jitsi/generate-meapp-fullstack-service) (jitsi/generate-deployment config) - (jitsi/generate-excalidraw-deployment)] + (jitsi/generate-excalidraw-deployment) + (jitsi/generate-meapp-deployment)] (jitsi/generate-ingress-web config) (jitsi/generate-ingress-etherpad config) - (jitsi/generate-ingress-excalidraw-backend config) + (jitsi/generate-ingress-meapp-fullstack config) (when (:contains? config :mon-cfg) (mon/generate (:mon-cfg config) (:mon-auth auth))))))) diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc index dad571d..109e0d7 100644 --- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc +++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc @@ -53,6 +53,15 @@ :fqdns [(str "excalidraw-backend." (:fqdn config))]} config))) +(defn-spec generate-ingress-meapp-fullstack cp/map-or-seq? + [config config?] + (ing/generate-ingress-and-cert + (merge + {:service-name "meapp-fullstack" + :service-port 6333 + :fqdns [(str "meapp-fullstack." (:fqdn config))]} + config))) + (defn-spec generate-secret-jitsi cp/map-or-seq? [auth auth?] (let [{:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth] @@ -74,6 +83,9 @@ (defn-spec generate-excalidraw-backend-service cp/map-or-seq? [] (yaml/load-as-edn "jitsi/excalidraw-backend-service.yaml")) +(defn-spec generate-meapp-fullstack-service cp/map-or-seq? [] + (yaml/load-as-edn "jitsi/meapp-fullstack-service.yaml")) + (defn-spec generate-deployment cp/map-or-seq? [config config?] (let [{:keys [fqdn]} config] @@ -87,3 +99,6 @@ (defn-spec generate-excalidraw-deployment cp/map-or-seq? [] (yaml/load-as-edn "jitsi/excalidraw-deployment.yaml")) + +(defn-spec generate-meapp-deployment cp/map-or-seq? [] + (yaml/load-as-edn "jitsi/meapp-deployment.yaml")) diff --git a/src/main/resources/jitsi/meapp-fullstack-service.yaml b/src/main/resources/jitsi/meapp-fullstack-service.yaml index 9ef3b2d..35056cc 100644 --- a/src/main/resources/jitsi/meapp-fullstack-service.yaml +++ b/src/main/resources/jitsi/meapp-fullstack-service.yaml @@ -7,7 +7,7 @@ metadata: spec: ports: - name: meapp-fullstack - port: 8080 - targetPort: 80 + port: 6333 + targetPort: 8080 selector: app: meapp-fullstack \ No newline at end of file