jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-04-19 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2022-12-19 01:00

Browse Source
This commit is contained in:
Daniel Berteaud 2022-12-19 01:00:28 +01:00
parent ff1777c9a6
commit 7559933717
4 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/jitsi/tasks/conf.yml
View File

@ -36,7 +36,6 @@
template: src=jicofo/{{ item }}.j2 dest={{ jitsi_root_dir }}/etc/jicofo/{{ item }} group={{ jitsi_user }} mode=640 template: src=jicofo/{{ item }}.j2 dest={{ jitsi_root_dir }}/etc/jicofo/{{ item }} group={{ jitsi_user }} mode=640
loop: loop:
- jicofo.conf - jicofo.conf
- sip-communicator.properties
notify: restart jitsi-jicofo notify: restart jitsi-jicofo
tags: jitsi tags: jitsi

38
roles/jitsi/templates/jicofo/jicofo.conf.j2
View File

@ -1,8 +1,32 @@
# {{ ansible_managed }} # {{ ansible_managed }}
JICOFO_HOST={{ jitsi_xmpp_server }} jicofo {
JICOFO_DOMAIN={{ jitsi_domain }}
JICOFO_USER={{ jitsi_jicofo_xmpp_user }} authentication {
JICOFO_USERDOMAIN={{ jitsi_auth_domain }} enabled = {{ (jitsi_auth == 'sso' or jitsi_auth == 'ldap') | ternary('true', 'false') }}
JICOFO_USER_PASS='{{ jitsi_jicofo_xmpp_pass }}' type = {{ (jitsi_auth == 'ldap') | ternary('XMPP', 'SHIBBOLETH') }}
JICOFO_OPTS='' }
JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION={{ jitsi_root_dir }}/etc -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo"
bridge {
brewery-jid = "JvbBrewery@internal.{{ jitsi_auth_domain }}"
}
jibri {
brewery-jid = "JibriBrewery@internal.{{ jitsi_auth_domain }}"
}
{% if jitsi_jigasi %}
jigasi {
brewery-jid = "JigasiBrewery@internal.{{ jitsi_auth_domain }}"
}
{% endif %}
xmpp {
client {
domain = {{ jitsi_auth_domain }}
xmpp-domain = {{ jitsi_domain }}
username = {{ jitsi_jicofo_xmpp_user }}
password = "{{ jitsi_jicofo_xmpp_pass }}"
client-proxy = focus.{{ jitsi_domain }}
}
}
}

11
roles/jitsi/templates/jicofo/sip-communicator.properties.j2
View File

@ -1,11 +0,0 @@
{% if jitsi_auth == 'sso' %}
org.jitsi.jicofo.auth.URL=shibboleth:default
{% elif jitsi_auth == 'ldap' %}
org.jitsi.jicofo.auth.URL=XMPP:{{ jitsi_domain }}
{% endif %}
org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.{{ jitsi_auth_domain }}
{% if jitsi_jigasi %}
org.jitsi.jicofo.jigasi.BREWERY=JigasiBrewery@internal.{{ jitsi_auth_domain }}
{% endif %}
org.jitsi.jicofo.jibri.BREWERY=JibriBrewery@internal.{{ jitsi_auth_domain }}
org.jitsi.jicofo.jibri.PENDING_TIMEOUT=90

8
roles/jitsi/templates/jitsi-jicofo.service.j2
View File

@ -5,7 +5,6 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
SuccessExitStatus=143 SuccessExitStatus=143
EnvironmentFile={{ jitsi_root_dir }}/etc/jicofo/jicofo.conf
User={{ jitsi_user }} User={{ jitsi_user }}
Group={{ jitsi_user }} Group={{ jitsi_user }}
PrivateTmp=true PrivateTmp=true
@ -16,13 +15,8 @@ ReadOnlyDirectories={{ jitsi_root_dir }}/etc {{ jitsi_root_dir }}/jicofo
Restart=on-failure Restart=on-failure
StartLimitInterval=0 StartLimitInterval=0
RestartSec=30 RestartSec=30
Environment=JAVA_SYS_PROPS=-Dconfig.file={{ jitsi_root_dir }}/etc/jicofo/jicofo.conf
ExecStart=/opt/jitsi/jicofo/jicofo.sh \ ExecStart=/opt/jitsi/jicofo/jicofo.sh \
--host=${JICOFO_HOST} \
--domain=${JICOFO_DOMAIN} \
--secret=${JICOFO_SECRET} \
--user_domain=${JICOFO_USERDOMAIN} \
--user_name=${JICOFO_USER} \
--user_password=${JICOFO_USER_PASS} \
${JICOFO_OPT} ${JICOFO_OPT}
SyslogIdentifier=jicofo SyslogIdentifier=jicofo