fix ns for secrets
This commit is contained in:
parent
b79956fe77
commit
13c5ac14c9
3 changed files with 9 additions and 5 deletions
src
|
@ -52,12 +52,12 @@
|
||||||
(defn-spec auth-objects cp/map-or-seq?
|
(defn-spec auth-objects cp/map-or-seq?
|
||||||
[config config?
|
[config config?
|
||||||
auth auth?]
|
auth auth?]
|
||||||
|
(let [resolved-config (merge config-defaults config)]
|
||||||
(map yaml/to-string
|
(map yaml/to-string
|
||||||
(filter
|
(filter
|
||||||
#(not (nil? %))
|
#(not (nil? %))
|
||||||
(cm/concat-vec
|
(cm/concat-vec
|
||||||
(jitsi/prosody-auth auth)
|
(jitsi/prosody-auth config auth)
|
||||||
;[(jitsi/generate-secret-jitsi config auth)]
|
;[(jitsi/generate-secret-jitsi config auth)]
|
||||||
(when (:contains? config :mon-cfg)
|
(when (:contains? config :mon-cfg)
|
||||||
(mon/generate-auth (:mon-cfg config) (:mon-auth auth)))))))
|
(mon/generate-auth (:mon-cfg config) (:mon-auth auth))))))))
|
||||||
|
|
||||||
|
|
|
@ -159,8 +159,10 @@
|
||||||
(load-and-adjust-namespace "jitsi/prosody-config-test-deployment.yaml" namespace)]))
|
(load-and-adjust-namespace "jitsi/prosody-config-test-deployment.yaml" namespace)]))
|
||||||
|
|
||||||
(defn-spec prosody-auth cp/map-or-seq?
|
(defn-spec prosody-auth cp/map-or-seq?
|
||||||
[auth auth?]
|
[config config?
|
||||||
(let [{:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth]
|
auth auth?]
|
||||||
|
(let [{:keys [namespace]} config
|
||||||
|
{:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth]
|
||||||
[(load-and-adjust-namespace "jitsi/prosody-auth-secret.yaml" namespace)
|
[(load-and-adjust-namespace "jitsi/prosody-auth-secret.yaml" namespace)
|
||||||
(load-and-adjust-namespace "jitsi/prosody-auth-jibri-secret.yaml" namespace)
|
(load-and-adjust-namespace "jitsi/prosody-auth-jibri-secret.yaml" namespace)
|
||||||
(->
|
(->
|
||||||
|
|
|
@ -340,6 +340,8 @@
|
||||||
:namespace "jitsi"}))))
|
:namespace "jitsi"}))))
|
||||||
(is (= 5
|
(is (= 5
|
||||||
(count (cut/prosody-auth
|
(count (cut/prosody-auth
|
||||||
|
{:fqdn "xy.xy.xy"
|
||||||
|
:namespace "jitsi"}
|
||||||
{:jvb-auth-password "jvb-auth"
|
{:jvb-auth-password "jvb-auth"
|
||||||
:jicofo-auth-password "jicofo-auth"
|
:jicofo-auth-password "jicofo-auth"
|
||||||
:jicofo-component-secret "jicofo-comp"})))))
|
:jicofo-component-secret "jicofo-comp"})))))
|
Loading…
Add table
Reference in a new issue