diff options
author | Christian Pointner <equinox@spreadspace.org> | 2022-04-18 23:33:51 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2022-04-18 23:33:51 +0200 |
commit | 3525f55f23b18007cc54678897357bc573f0f017 (patch) | |
tree | 13ebfb07d46f5060f2d18b7bc7f37a484af161e1 /roles/apps/jitsi/meet/tasks | |
parent | ch-installsmb: fix symlink target (diff) | |
parent | jitsi/meet: also deploy fixes to meet1.linuxtage.at (diff) |
Merge branch 'experiment/jitsi-jvb-tweaks'
Diffstat (limited to 'roles/apps/jitsi/meet/tasks')
-rw-r--r-- | roles/apps/jitsi/meet/tasks/main.yml | 87 |
1 files changed, 55 insertions, 32 deletions
diff --git a/roles/apps/jitsi/meet/tasks/main.yml b/roles/apps/jitsi/meet/tasks/main.yml index b9dcbeb0..b16fad07 100644 --- a/roles/apps/jitsi/meet/tasks/main.yml +++ b/roles/apps/jitsi/meet/tasks/main.yml @@ -9,6 +9,32 @@ path: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/{{ item }}" state: directory +- name: configure base pod config hash items + set_fact: + kubernetes_standalone_pod_config_hash_items_base: + - path: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/prosody/cont-init.sh" + properties: + - checksum + kubernetes_standalone_pod_config_hash_items_streamui: [] + kubernetes_standalone_pod_config_hash_items_jvb_conf_extra: [] + +- name: generate generic prosody cont-init script + copy: + content: | + #!/usr/bin/with-contenv bash + sed -e 's#^\(component_interface\s*=\)#-- \1#g' -i /config/prosody.cfg.lua + {% if jitsi_meet_auth is defined %} + + echo "authentication enabled:" + {% for username, password in jitsi_meet_auth.users.items() %} + echo " * registering user: {{ username }}" + prosodyctl --config "/config/prosody.cfg.lua" register "{{ username }}" $XMPP_DOMAIN "{{ password }}" + {% endfor %} + {% endif %} + dest: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/prosody/cont-init.sh" + mode: 0750 + + - name: generate stream-ui specific cont-init scripts when: jitsi_meet_streamui is defined block: @@ -39,41 +65,38 @@ dest: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/web/streamui.sh" mode: 0755 -- name: generate generic prosody cont-init script - copy: - content: | - #!/usr/bin/with-contenv bash - sed -e 's#^\(component_interface\s*=\)#-- \1#g' -i /config/prosody.cfg.lua - {% if jitsi_meet_auth is defined %} + - name: configure stream-ui pod config hash items + set_fact: + kubernetes_standalone_pod_config_hash_items_streamui: + - path: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/prosody/streamui.sh" + properties: + - checksum + - path: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/web/streamui.sh" + properties: + - checksum - echo "authentication enabled:" - {% for username, password in jitsi_meet_auth.users.items() %} - echo " * registering user: {{ username }}" - prosodyctl --config "/config/prosody.cfg.lua" register "{{ username }}" $XMPP_DOMAIN "{{ password }}" - {% endfor %} - {% endif %} - dest: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/prosody/cont-init.sh" - mode: 0750 +- name: generate jvb cont-init script for extra config snippet + when: jitsi_meet_jvb_config_extra is defined + block: + - name: add jvb extra config snippet to cont-init script of jvb + copy: + content: | + #!/usr/bin/with-contenv bash + cat << EOF >> /config/jvb.conf -- name: configure base pod config hash items - set_fact: - kubernetes_standalone_pod_config_hash_items_base: - - path: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/prosody/cont-init.sh" - properties: - - checksum - kubernetes_standalone_pod_config_hash_items_streamui: [] + {{ jitsi_meet_jvb_config_extra }} + EOF + dest: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/jvb/cont-init.sh" + mode: 0750 + + - name: configure jvb extra config pod config hash items + set_fact: + kubernetes_standalone_pod_config_hash_items_jvb_conf_extra: + - path: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/jvb/cont-init.sh" + properties: + - checksum -- name: configure stream-ui pod config hash items - when: jitsi_meet_streamui is defined - set_fact: - kubernetes_standalone_pod_config_hash_items_streamui: - - path: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/prosody/streamui.sh" - properties: - - checksum - - path: "{{ jitsi_meet_base_path }}/{{ jitsi_meet_inst_name }}/scripts/prosody/streamui.sh" - properties: - - checksum - name: install pod manifest vars: @@ -81,7 +104,7 @@ name: "jitsi-meet-{{ jitsi_meet_inst_name }}" spec: "{{ lookup('template', 'pod-spec.yml.j2') }}" mode: "0600" - config_hash_items: "{{ kubernetes_standalone_pod_config_hash_items_base + kubernetes_standalone_pod_config_hash_items_streamui }}" + config_hash_items: "{{ kubernetes_standalone_pod_config_hash_items_base + kubernetes_standalone_pod_config_hash_items_streamui + kubernetes_standalone_pod_config_hash_items_jvb_conf_extra }}" include_role: name: kubernetes/standalone/pod |