From 3c14509f56577daf597ce9f8633d930cbd3eb94c Mon Sep 17 00:00:00 2001 From: rene Date: Thu, 10 Mar 2022 10:59:21 +0100 Subject: [PATCH 1/4] skip tasks if preinstalled --- roles/jitsimeet/tasks/main.yml | 1 + roles/jitsimeet/tasks/prepare_system.yml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/jitsimeet/tasks/main.yml b/roles/jitsimeet/tasks/main.yml index e4d3a4b..8911913 100644 --- a/roles/jitsimeet/tasks/main.yml +++ b/roles/jitsimeet/tasks/main.yml @@ -9,6 +9,7 @@ # import role webserver - import_role: name: webserver # required. The name of the role to be executed. + when: preinstalled == false or preinstalled is not defined # install software - include_tasks: prepare_system.yml diff --git a/roles/jitsimeet/tasks/prepare_system.yml b/roles/jitsimeet/tasks/prepare_system.yml index 0b96251..0ac209d 100644 --- a/roles/jitsimeet/tasks/prepare_system.yml +++ b/roles/jitsimeet/tasks/prepare_system.yml @@ -10,11 +10,13 @@ - name: jitsimeet | reload systemd systemd: daemon_reload: true + when: preinstalled == false or preinstalled is not defined - name: jitsimeet | import GPG key apt_key: url: "https://download.jitsi.org/jitsi-key.gpg.key" state: present # not required. choices: absent;present. Ensures that the key is present (added) or absent (revoked). + when: preinstalled == false or preinstalled is not defined - name: jitsimeet | add repository lineinfile: @@ -23,6 +25,7 @@ create: True backup: True notify: apt_update + when: preinstalled == false or preinstalled is not defined - name: jitsimeet | flush handlers meta: flush_handlers @@ -31,4 +34,4 @@ package: name: debconf-utils state: latest - when: preinstalled == false or preinstalled is not defined \ No newline at end of file + when: preinstalled == false or preinstalled is not defined \ No newline at end of file From ec99901f8a95cb2e58181233c0c8fd3c2a20561c Mon Sep 17 00:00:00 2001 From: rene Date: Thu, 10 Mar 2022 10:59:42 +0100 Subject: [PATCH 2/4] setup git config --- roles/base/tasks/main.yml | 1 + roles/base/tasks/system_setup/git.yml | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 roles/base/tasks/system_setup/git.yml diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index a98cc9b..c52d70a 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -7,6 +7,7 @@ msg: Debug # basics - import_tasks: system_setup/hostname.yml + - import_tasks: system_setup/git.yml # install software # - import_tasks: software/repositories.yml - import_tasks: software/packages_zsh.yml diff --git a/roles/base/tasks/system_setup/git.yml b/roles/base/tasks/system_setup/git.yml new file mode 100644 index 0000000..eb68da8 --- /dev/null +++ b/roles/base/tasks/system_setup/git.yml @@ -0,0 +1,11 @@ +- name: base | system_setup | git config user.email + git_config: + name: user.email # not required. The name of the setting. If no value is supplied, the value will be read from the config if it has been set. + value: 'root@{{ ansible_fqdn }}' + scope: global + +- name: base | system_setup | git config user.name + git_config: + name: user.name + value: 'root' + scope: global \ No newline at end of file From 09517fd4dc8228d4e816045d05b9bbc40204dcec Mon Sep 17 00:00:00 2001 From: rene Date: Thu, 10 Mar 2022 11:01:33 +0100 Subject: [PATCH 3/4] removed tantooine, because wg will not come up --- roles/server/tasks/system_setup/hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/server/tasks/system_setup/hosts.yml b/roles/server/tasks/system_setup/hosts.yml index 0daf93b..b1ae9e3 100644 --- a/roles/server/tasks/system_setup/hosts.yml +++ b/roles/server/tasks/system_setup/hosts.yml @@ -6,7 +6,7 @@ owner: 'root' group: 'root' loop: - - { ip: '192.168.1.240', fqdn: 'gitlab.social.my-wan.de tantooine.myfirewall.org'} + - { ip: '192.168.1.240', fqdn: 'gitlab.social.my-wan.de'} when: - set_hosts is defined - set_hosts == true \ No newline at end of file From a55ec37dbff9a6cc965b0825ae710984fabc94d0 Mon Sep 17 00:00:00 2001 From: rene Date: Thu, 10 Mar 2022 11:31:19 +0100 Subject: [PATCH 4/4] removed unneccessary files --- roles/jitsimeet/files/jitsi_etc/jicofo/config | 27 ---------- .../files/jitsi_etc/jicofo/jicofo.conf | 10 ---- .../files/jitsi_etc/jicofo/logging.properties | 38 -------------- .../jicofo/sip-communicator.properties | 1 - .../files/jitsi_etc/meet/mewimeet.de.crt | 31 ----------- .../files/jitsi_etc/meet/mewimeet.de.key | 52 ------------------- .../videobridge/callstats-java-sdk.properties | 5 -- .../files/jitsi_etc/videobridge/config | 20 ------- .../files/jitsi_etc/videobridge/jvb.conf | 12 ----- .../files/jitsi_etc/videobridge/log4j2.xml | 33 ------------ .../jitsi_etc/videobridge/logging.properties | 34 ------------ .../videobridge/logging.properties.dpkg-old | 44 ---------------- .../videobridge/sip-communicator.properties | 10 ---- 13 files changed, 317 deletions(-) delete mode 100644 roles/jitsimeet/files/jitsi_etc/jicofo/config delete mode 100644 roles/jitsimeet/files/jitsi_etc/jicofo/jicofo.conf delete mode 100644 roles/jitsimeet/files/jitsi_etc/jicofo/logging.properties delete mode 100644 roles/jitsimeet/files/jitsi_etc/jicofo/sip-communicator.properties delete mode 100644 roles/jitsimeet/files/jitsi_etc/meet/mewimeet.de.crt delete mode 100644 roles/jitsimeet/files/jitsi_etc/meet/mewimeet.de.key delete mode 100644 roles/jitsimeet/files/jitsi_etc/videobridge/callstats-java-sdk.properties delete mode 100644 roles/jitsimeet/files/jitsi_etc/videobridge/config delete mode 100644 roles/jitsimeet/files/jitsi_etc/videobridge/jvb.conf delete mode 100644 roles/jitsimeet/files/jitsi_etc/videobridge/log4j2.xml delete mode 100644 roles/jitsimeet/files/jitsi_etc/videobridge/logging.properties delete mode 100644 roles/jitsimeet/files/jitsi_etc/videobridge/logging.properties.dpkg-old delete mode 100644 roles/jitsimeet/files/jitsi_etc/videobridge/sip-communicator.properties diff --git a/roles/jitsimeet/files/jitsi_etc/jicofo/config b/roles/jitsimeet/files/jitsi_etc/jicofo/config deleted file mode 100644 index db42ca6..0000000 --- a/roles/jitsimeet/files/jitsi_etc/jicofo/config +++ /dev/null @@ -1,27 +0,0 @@ -# Jitsi Conference Focus settings -# sets the host name of the XMPP server -JICOFO_HOST=localhost - -# sets the XMPP domain (default: none) -JICOFO_HOSTNAME=mewimeet.de - -# sets the secret used to authenticate as an XMPP component -JICOFO_SECRET=QX6oyTT2 - -# sets the port to use for the XMPP component connection -JICOFO_PORT=5347 - -# sets the XMPP domain name to use for XMPP user logins -JICOFO_AUTH_DOMAIN=auth.mewimeet.de - -# sets the username to use for XMPP user logins -JICOFO_AUTH_USER=focus - -# sets the password to use for XMPP user logins -JICOFO_AUTH_PASSWORD=skrXCC0Z - -# extra options to pass to the jicofo daemon -JICOFO_OPTS="" - -# adds java system props that are passed to jicofo (default are for home and logging config file) -JAVA_SYS_PROPS="-Dconfig.file=/etc/jitsi/jicofo/jicofo.conf -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties" diff --git a/roles/jitsimeet/files/jitsi_etc/jicofo/jicofo.conf b/roles/jitsimeet/files/jitsi_etc/jicofo/jicofo.conf deleted file mode 100644 index fd9a5db..0000000 --- a/roles/jitsimeet/files/jitsi_etc/jicofo/jicofo.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Jicofo HOCON configuration. See /usr/share/jicofo/jicofo.jar/reference.conf for -#available options, syntax, and default values. -jicofo { - xmpp: { - client: { - client-proxy: focus.mewimeet.de - } - trusted-domains: [ "recorder.mewimeet.de" ] - } -} diff --git a/roles/jitsimeet/files/jitsi_etc/jicofo/logging.properties b/roles/jitsimeet/files/jitsi_etc/jicofo/logging.properties deleted file mode 100644 index 7181e26..0000000 --- a/roles/jitsimeet/files/jitsi_etc/jicofo/logging.properties +++ /dev/null @@ -1,38 +0,0 @@ - -handlers= java.util.logging.ConsoleHandler - -# Handlers with XMPP debug enabled: -#handlers= java.util.logging.ConsoleHandler, org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler - -# Handlers with syslog enabled: -#handlers= java.util.logging.ConsoleHandler, com.agafua.syslog.SyslogHandler -#handlers= java.util.logging.ConsoleHandler, io.sentry.jul.SentryHandler - -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter -java.util.logging.ConsoleHandler.filter = org.jitsi.impl.protocol.xmpp.log.ExcludeXmppPackets - -org.jitsi.utils.logging2.JitsiLogFormatter.programname=Jicofo -.level=INFO - -# To enable XMPP packets logging add XmppPacketsFileHandler to the handlers property -org.jitsi.impl.protocol.xmpp.log.PacketDebugger.level=ALL -org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.pattern=/var/log/jitsi/jicofo-xmpp.log -org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.append=true -org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.limit=200000000 -org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.count=3 - -# Syslog (uncomment handler to use) -com.agafua.syslog.SyslogHandler.transport = udp -com.agafua.syslog.SyslogHandler.facility = local0 -com.agafua.syslog.SyslogHandler.port = 514 -com.agafua.syslog.SyslogHandler.hostname = localhost -com.agafua.syslog.SyslogHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter -com.agafua.syslog.SyslogHandler.escapeNewlines = false -com.agafua.syslog.SyslogHandler.filter = org.jitsi.impl.protocol.xmpp.log.ExcludeXmppPackets - -# Sentry (uncomment handler to use) -io.sentry.jul.SentryHandler.level=WARNING - -# uncomment to see how Jicofo talks to the JVB -#org.jitsi.impl.protocol.xmpp.colibri.level=ALL diff --git a/roles/jitsimeet/files/jitsi_etc/jicofo/sip-communicator.properties b/roles/jitsimeet/files/jitsi_etc/jicofo/sip-communicator.properties deleted file mode 100644 index 8d61d15..0000000 --- a/roles/jitsimeet/files/jitsi_etc/jicofo/sip-communicator.properties +++ /dev/null @@ -1 +0,0 @@ -org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.auth.mewimeet.de diff --git a/roles/jitsimeet/files/jitsi_etc/meet/mewimeet.de.crt b/roles/jitsimeet/files/jitsi_etc/meet/mewimeet.de.crt deleted file mode 100644 index ada0291..0000000 --- a/roles/jitsimeet/files/jitsi_etc/meet/mewimeet.de.crt +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFazCCA1OgAwIBAgIULq/oDtzgQH7vA6vxmixotrA9EIYwDQYJKoZIhvcNAQEL -BQAwXDELMAkGA1UECgwCZGUxETAPBgNVBAsMCG1ld2ltZWV0MRQwEgYDVQQDDAtt -ZXdpbWVldC5kZTEkMCIGCSqGSIb3DQEJARYVd2VibWFzdGVyQG1ld2ltZWV0LmRl -MB4XDTIxMDEyOTExMjczMFoXDTMxMDEyNzExMjczMFowXDELMAkGA1UECgwCZGUx -ETAPBgNVBAsMCG1ld2ltZWV0MRQwEgYDVQQDDAttZXdpbWVldC5kZTEkMCIGCSqG -SIb3DQEJARYVd2VibWFzdGVyQG1ld2ltZWV0LmRlMIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEA3Ow9xCEwyrTnoIsC2pQALrb4KKx6G/owbCLW1WVV8ggw -wcF6Udxwy2L3mvAoJKn+uXiS+4i8ksTH3tlrhq1/zgSZ8R62JUG8H7V3bN5PkFds -l36UyIFBwkFBqcnSwu5iZyb4QeoTtecKVqtMqkyDsWkn+xxCJa1qZ2cK7sEm8mQ1 -qBMTBfBicGg7+Z4dsYOQ6aTJEzZ+xTawBSPH8vMH9MHUOTKD7n+3xUyoXNX0hGN5 -1gpsUbQidUuHSnoW2q1qQ0EPR4Fmhx+OxgxH3u7M3/ZiwmwV1vu0eOpcCprexJ4p -w8oT1pnLcrvYE8GVpjK7wIRsEZ1MRB/ET9mwyjhzY8HmUA+BbEfNwAmgBFwungpO -Qzt/3QVkd17czC5ngwpRCk9CJK+h6+gmhFcKwf4xNLXUgoXBs+TlQxeb+0YH9fgD -KZyvQYEDnIGwhcImOpAAail1bCoh4rvLJE1WTtozZZQtoiegC/ZAPa6PrnitN21I -JryVKO6dzXA3yZniyH/ESn6+blCAbRWJX/wjaCN9k7QW3IBLc3rkB/21OLRGFIDG -VSWgg/y5Iw8OvDRoSXWYhkVeQPZncGBk5AbLwFT4VlhP+7vTXjbPvfJ9F9FeL9lx -EV90wOEjB2cjQBzXON9yEDlgQdyzu7bS97ZSSqOVOL5JqL3Yf3N5NJ5T7T5kk+cC -AwEAAaMlMCMwIQYDVR0RBBowGIIJbG9jYWxob3N0ggttZXdpbWVldC5kZTANBgkq -hkiG9w0BAQsFAAOCAgEAMKSmUqdJ0gsBQtaweLQ9OdSSF4Wm24rw9jg6p4+0k1ly -SxE4gh7IqSv/szjeBKylLIBz+wVCADrFTUpDV2ro3cfoRNwTfbayxk85KtK31Byi -3ydOxVHnYq1dHQQGMl8q3XMtKgGFzWkpNgkzMfoxTmvJsu+x3PAqUh/OEqC/BwH1 -P/bGNfh/1Ur+OcfixswOwY82p7Mb92mNALVvgPlQpZqLAtbAcfwd4b8DVZPmF379 -09zLtrh0/GMUp9dnHv9PWnUxBap2Q8+qBsojUbxXrsmlyJJANfPuWlC/ipDl3Hds -rwGbK2MkaGLnyz5U8sYNxm+0FBygLD7Q1iBOiQhtYTqpQ2pxC3wgfTr1KMnhbzP1 -zU66l87Ckd/rU4i/dgFFQofqYmPQrZt4CCOtCSY8SQCUREXg7G7pvfyfRXosnox2 -fsbjIrQzgeRrsje9bMUujRUgh7pb4g6K+RhdYNsFVgQZbc5HCmya7EKB+nnLtLYg -z2HZ1OdfOQ1hnuZ1zvRXg+YSUPTh2eNC6yuMDLe9BOcwpuhW59CWAU3/atQO1lEf -sSUE2qNZ0sI9Ce6Enow3+0RkAlCIwjqpZxvZjE2q3O4s2WwKro1A2L9MxzTfupy8 -tDS5m5E190718Q/AWvHBtJdEIOcNmv4YNVk78OTXxzbD9R2Kd9IN0ob7QMI89oM= ------END CERTIFICATE----- diff --git a/roles/jitsimeet/files/jitsi_etc/meet/mewimeet.de.key b/roles/jitsimeet/files/jitsi_etc/meet/mewimeet.de.key deleted file mode 100644 index 3663764..0000000 --- a/roles/jitsimeet/files/jitsi_etc/meet/mewimeet.de.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -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 -keSc8QTQKH4jLs9k3REYPFRyHRRPAg== ------END PRIVATE KEY----- diff --git a/roles/jitsimeet/files/jitsi_etc/videobridge/callstats-java-sdk.properties b/roles/jitsimeet/files/jitsi_etc/videobridge/callstats-java-sdk.properties deleted file mode 100644 index 8fe294e..0000000 --- a/roles/jitsimeet/files/jitsi_etc/videobridge/callstats-java-sdk.properties +++ /dev/null @@ -1,5 +0,0 @@ -CallStats.BaseURL = https://collector.callstats.io:443 -CallStats.AuthTimeOut = 5000 -CallStats.ConnectionTimeOut = 30000 -CallStats.SOTimeOut = 30000 -CallStats.keepAliveInterval = 1000 diff --git a/roles/jitsimeet/files/jitsi_etc/videobridge/config b/roles/jitsimeet/files/jitsi_etc/videobridge/config deleted file mode 100644 index f069398..0000000 --- a/roles/jitsimeet/files/jitsi_etc/videobridge/config +++ /dev/null @@ -1,20 +0,0 @@ -# Jitsi Videobridge settings - -# sets the XMPP domain (default: none) -JVB_HOSTNAME=mewimeet.de - -# sets the hostname of the XMPP server (default: domain if set, localhost otherwise) -JVB_HOST= - -# sets the port of the XMPP server (default: 5275) -JVB_PORT=5347 - -# sets the shared secret used to authenticate to the XMPP server -JVB_SECRET=40asD7gu - -# extra options to pass to the JVB daemon -JVB_OPTS="--apis=rest," - - -# adds java system props that are passed to jvb (default are for home and logging config file) -JAVA_SYS_PROPS="-Dconfig.file=/etc/jitsi/videobridge/jvb.conf -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties" diff --git a/roles/jitsimeet/files/jitsi_etc/videobridge/jvb.conf b/roles/jitsimeet/files/jitsi_etc/videobridge/jvb.conf deleted file mode 100644 index 54cc683..0000000 --- a/roles/jitsimeet/files/jitsi_etc/videobridge/jvb.conf +++ /dev/null @@ -1,12 +0,0 @@ -videobridge { - http-servers { - public { - port = 9090 - } - } - websockets { - enabled = true - domain = "mewimeet.de:443" - tls = true - } -} diff --git a/roles/jitsimeet/files/jitsi_etc/videobridge/log4j2.xml b/roles/jitsimeet/files/jitsi_etc/videobridge/log4j2.xml deleted file mode 100644 index a9bcaef..0000000 --- a/roles/jitsimeet/files/jitsi_etc/videobridge/log4j2.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - /var/log/jitsi - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/roles/jitsimeet/files/jitsi_etc/videobridge/logging.properties b/roles/jitsimeet/files/jitsi_etc/videobridge/logging.properties deleted file mode 100644 index 3c364a4..0000000 --- a/roles/jitsimeet/files/jitsi_etc/videobridge/logging.properties +++ /dev/null @@ -1,34 +0,0 @@ -handlers= java.util.logging.ConsoleHandler -#handlers= java.util.logging.ConsoleHandler, com.agafua.syslog.SyslogHandler -#handlers= java.util.logging.ConsoleHandler, io.sentry.jul.SentryHandler - -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter - -org.jitsi.utils.logging2.JitsiLogFormatter.programname=JVB -.level=INFO - -# Syslog (uncomment handler to use) -com.agafua.syslog.SyslogHandler.transport = udp -com.agafua.syslog.SyslogHandler.facility = local0 -com.agafua.syslog.SyslogHandler.port = 514 -com.agafua.syslog.SyslogHandler.hostname = localhost -com.agafua.syslog.SyslogHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter -com.agafua.syslog.SyslogHandler.escapeNewlines = false - -# Sentry (uncomment handler to use) -io.sentry.jul.SentryHandler.level=WARNING - -# time series logging -java.util.logging.SimpleFormatter.format= %5$s%n -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.pattern = /tmp/jvb-series.log -java.util.logging.FileHandler.limit = 200000000 -java.util.logging.FileHandler.count = 1 -java.util.logging.FileHandler.append = false - -timeseries.level=OFF -timeseries.useParentHandlers = false -# time series logging is disabled by default. Uncomment the line below to enable it. -#timeseries.handlers = java.util.logging.FileHandler diff --git a/roles/jitsimeet/files/jitsi_etc/videobridge/logging.properties.dpkg-old b/roles/jitsimeet/files/jitsi_etc/videobridge/logging.properties.dpkg-old deleted file mode 100644 index 8e9af29..0000000 --- a/roles/jitsimeet/files/jitsi_etc/videobridge/logging.properties.dpkg-old +++ /dev/null @@ -1,44 +0,0 @@ -handlers= java.util.logging.ConsoleHandler -#handlers= java.util.logging.ConsoleHandler, com.agafua.syslog.SyslogHandler -#handlers= java.util.logging.ConsoleHandler, io.sentry.jul.SentryHandler - -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter - -net.java.sip.communicator.util.ScLogFormatter.programname=JVB - -.level=WARNING - -org.jitsi.videobridge.xmpp.ComponentImpl.level=FINE - -# All of the INFO level logs from MediaStreamImpl are unnecessary in the context of jitsi-videobridge. -org.jitsi.impl.neomedia.MediaStreamImpl.level=WARNING - -# Syslog (uncomment handler to use) -com.agafua.syslog.SyslogHandler.transport = udp -com.agafua.syslog.SyslogHandler.facility = local0 -com.agafua.syslog.SyslogHandler.port = 514 -com.agafua.syslog.SyslogHandler.hostname = localhost -com.agafua.syslog.SyslogHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter -com.agafua.syslog.SyslogHandler.escapeNewlines = false - -# Sentry (uncomment handler to use) -io.sentry.jul.SentryHandler.level=WARNING - -# to disable double timestamps in syslog uncomment next line -#net.java.sip.communicator.util.ScLogFormatter.disableTimestamp=true - -# time series logging -java.util.logging.SimpleFormatter.format= %5$s%n -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.pattern = /tmp/jvb-series.log -java.util.logging.FileHandler.limit = 200000000 -java.util.logging.FileHandler.count = 1 -java.util.logging.FileHandler.append = false - -timeseries.level=OFF -timeseries.org.jitsi.videobridge.cc.allocation.BitrateAllocator.level=ALL -timeseries.useParentHandlers = false -# time series logging is disabled by default. Uncomment the line below to enable it. -#timeseries.handlers = java.util.logging.FileHandler diff --git a/roles/jitsimeet/files/jitsi_etc/videobridge/sip-communicator.properties b/roles/jitsimeet/files/jitsi_etc/videobridge/sip-communicator.properties deleted file mode 100644 index c23465c..0000000 --- a/roles/jitsimeet/files/jitsi_etc/videobridge/sip-communicator.properties +++ /dev/null @@ -1,10 +0,0 @@ -org.ice4j.ice.harvest.DISABLE_AWS_HARVESTER=true -org.ice4j.ice.harvest.STUN_MAPPING_HARVESTER_ADDRESSES=meet-jit-si-turnrelay.jitsi.net:443 -org.jitsi.videobridge.ENABLE_STATISTICS=true -org.jitsi.videobridge.STATISTICS_TRANSPORT=muc,colibri -org.jitsi.videobridge.xmpp.user.shard.HOSTNAME=localhost -org.jitsi.videobridge.xmpp.user.shard.DOMAIN=auth.mewimeet.de -org.jitsi.videobridge.xmpp.user.shard.USERNAME=jvb -org.jitsi.videobridge.xmpp.user.shard.PASSWORD=40asD7gu -org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.mewimeet.de -org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME=27bc8fdd-a3ea-4eef-ab78-eea0cf703453