Commit 720ca4d8 authored by mh's avatar mh
Browse files

update to the latest config version

parent c83da9ca
org.jitsi.jicofo.auth.URL=shibboleth:default
org.jitsi.jicofo.auth.LOGOUT_URL=shibboleth:default
......@@ -42,15 +42,6 @@ define ib_apache::services::jitsi_meet::instance (
'puppet:///modules/site_apache/services/jitsi-meet/interface_config.js',
'puppet:///modules/ib_apache/services/jitsi-meet/interface_config.js',
];
} -> file {
# this file will be owned by the container and thus only gets initial permissions to start
"/var/www/vhosts/${name}/data/jicofo/custom-sip-communicator.properties":
seltype => container_file_t,
notify => Service["con-${name}-${name}.service"],
source => 'puppet:///modules/ib_apache/services/jitsi-meet/sip-communicator.properties';
} ~> exec { "jitsi-meet-${name}-own-sip-communicator.properties":
command => "sh -c 'chown ${uid_name}:${real_gid_name} /var/www/vhosts/${name}/data/jicofo/custom-sip-communicator.properties && chmod 0644 /var/www/vhosts/${name}/data/jicofo/custom-sip-communicator.properties'",
refreshonly => true;
}
}
......
......@@ -31,32 +31,10 @@ spec:
value: "<%= @configuration['public_ip'] %>"
- name: TZ
value: Europe/Amsterdam
- name: XMPP_AUTH_DOMAIN
value: auth.meet.jitsi
- name: JVB_BREWERY_MUC
value: jvbbrewery
- name: CONFIG
value: /var/jitsi-meet
- name: XMPP_MUC_DOMAIN
value: muc.meet.jitsi
- name: XMPP_INTERNAL_MUC_DOMAIN
value: internal-muc.meet.jitsi
- name: JVB_TCP_PORT
value: "4443"
- name: JIBRI_STRIP_DOMAIN_JID
value: muc
- name: XMPP_DOMAIN
value: meet.jitsi
- name: XMPP_SERVER
value: localhost
- name: XMPP_GUEST_DOMAIN
value: guest.meet.jitsi
- name: JVB_PORT
value: "10000"
- name: JVB_AUTH_USER
value: jvb
- name: JICOFO_AUTH_USER
value: focus
image: docker.io/jitsi/prosody:latest
name: jitsi-meet-prosody.meet.jitsi
resources: {}
......@@ -94,32 +72,10 @@ spec:
value: "<%= @configuration['public_ip'] %>"
- name: TZ
value: Europe/Amsterdam
- name: XMPP_AUTH_DOMAIN
value: auth.meet.jitsi
- name: JVB_BREWERY_MUC
value: jvbbrewery
- name: CONFIG
value: /var/jitsi-meet
- name: XMPP_MUC_DOMAIN
value: muc.meet.jitsi
- name: XMPP_INTERNAL_MUC_DOMAIN
value: internal-muc.meet.jitsi
- name: JVB_TCP_PORT
value: "4443"
- name: JIBRI_STRIP_DOMAIN_JID
value: muc
- name: XMPP_DOMAIN
value: meet.jitsi
- name: XMPP_SERVER
value: localhost
- name: XMPP_GUEST_DOMAIN
value: guest.meet.jitsi
- name: JVB_PORT
value: "10000"
- name: JVB_AUTH_USER
value: jvb
- name: JICOFO_AUTH_USER
value: focus
image: docker.io/jitsi/web:latest
name: jitsi-meet-web.meet.jitsi
resources: {}
......@@ -135,6 +91,10 @@ spec:
- env:
- name: container
value: podman
- name: AUTH_TYPE
value: shibboleth
- name: ENABLE_AUTH
value: 1
- name: ENABLE_GUESTS
value: 1
- name: JVB_AUTH_PASSWORD
......@@ -157,34 +117,11 @@ spec:
value: "<%= @configuration['public_ip'] %>"
- name: TZ
value: Europe/Amsterdam
- name: XMPP_AUTH_DOMAIN
value: auth.meet.jitsi
- name: JVB_BREWERY_MUC
value: jvbbrewery
- name: CONFIG
value: /var/jitsi-meet
- name: XMPP_MUC_DOMAIN
value: muc.meet.jitsi
- name: XMPP_INTERNAL_MUC_DOMAIN
value: internal-muc.meet.jitsi
- name: JVB_TCP_PORT
value: "4443"
- name: JIBRI_STRIP_DOMAIN_JID
value: muc
- name: XMPP_DOMAIN
value: meet.jitsi
- name: XMPP_SERVER
value: localhost
- name: XMPP_GUEST_DOMAIN
value: guest.meet.jitsi
- name: JVB_PORT
value: "10000"
- name: JVB_AUTH_USER
value: jvb
- name: JICOFO_AUTH_USER
value: focus
#image: docker.io/jitsi/jicofo:latest - https://github.com/jitsi/docker-jitsi-meet/issues/956
image: docker.io/jitsi/jicofo:stable-5142-4
image: docker.io/jitsi/jicofo:latest
name: jitsi-meet-jicofo.meet.jitsi
ports:
- containerPort: 10000
......@@ -234,32 +171,12 @@ spec:
value: "<%= @configuration['public_ip'] %>"
- name: TZ
value: Europe/Amsterdam
- name: XMPP_AUTH_DOMAIN
value: auth.meet.jitsi
- name: JVB_BREWERY_MUC
value: jvbbrewery
- name: CONFIG
value: /var/jitsi-meet
- name: XMPP_MUC_DOMAIN
value: muc.meet.jitsi
- name: XMPP_INTERNAL_MUC_DOMAIN
value: internal-muc.meet.jitsi
- name: JVB_TCP_PORT
value: "4443"
- name: JIBRI_STRIP_DOMAIN_JID
value: muc
- name: XMPP_DOMAIN
value: meet.jitsi
- name: XMPP_SERVER
value: localhost
- name: XMPP_GUEST_DOMAIN
value: guest.meet.jitsi
- name: JVB_PORT
value: "10000"
- name: JVB_AUTH_USER
value: jvb
- name: JICOFO_AUTH_USER
value: focus
image: docker.io/jitsi/jvb:latest
name: jitsi-meet-jvb.meet.jitsi
resources: {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment