Merge pull request #1899 from etkecc/master

update bridges defaults
2022-06-27 11:03:19 +03:00
parent 92b37ae214 e27ecd6e76
commit f78b92c96a
19 changed files with 85 additions and 49 deletions
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -8,6 +8,10 @@
 # Example value: example.com
 matrix_domain: ~

+# The optional matrix admin MXID, used in bridges' configs to set bridge admin user
+# Example value: "@someone:{{ matrix_admin }}"
+matrix_admin: ''
+
 # This will contain the homeserver implementation that is in use.
 # Valid values: synapse, dendrite
 #
--- a/roles/matrix-bridge-beeper-linkedin/defaults/main.yml
+++ b/roles/matrix-bridge-beeper-linkedin/defaults/main.yml
@@ -25,6 +25,8 @@ matrix_beeper_linkedin_homeserver_address: "{{ matrix_homeserver_container_url }
 matrix_beeper_linkedin_homeserver_domain: "{{ matrix_domain }}"
 matrix_beeper_linkedin_appservice_address: "http://matrix-beeper-linkedin:29319"

+matrix_beeper_linkedin_bridge_presence: true
+
 # A list of extra arguments to pass to the container
 matrix_beeper_linkedin_container_extra_arguments: []

--- a/roles/matrix-bridge-beeper-linkedin/templates/config.yaml.j2
+++ b/roles/matrix-bridge-beeper-linkedin/templates/config.yaml.j2
@@ -238,6 +238,9 @@ bridge:
    #     mxid - Specific user
    permissions:
        "{{ matrix_beeper_linkedin_homeserver_domain }}": user
+        {% if matrix_admin %}
+        "{{ matrix_admin }}": admin
+        {% endif %}



@@ -256,12 +259,12 @@ logging:
            formatter: colored
    loggers:
        mau:
-            level: DEBUG
+            level: WARNING
        paho:
-            level: INFO
+            level: WARNING
        aiohttp:
-            level: INFO
+            level: WARNING
    root:
-        level: DEBUG
+        level: WARNING
        handlers: [ console]

--- a/roles/matrix-bridge-go-skype-bridge/templates/config.yaml.j2
+++ b/roles/matrix-bridge-go-skype-bridge/templates/config.yaml.j2
@@ -199,6 +199,9 @@ bridge:
    #     mxid - Specific user
    permissions:
        "{{ matrix_go_skype_bridge_homeserver_domain }}": user
+        {% if matrix_admin %}
+        "{{ matrix_admin }}": admin
+        {% endif %}

    relaybot:
        # Whether or not relaybot support is enabled.
--- a/roles/matrix-bridge-mautrix-facebook/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-facebook/templates/config.yaml.j2
@@ -203,6 +203,9 @@ bridge:
    #     mxid - Specific user
    permissions:
      '{{ matrix_mautrix_facebook_homeserver_domain }}': user
+      {% if matrix_admin %}
+      '{{ matrix_admin }}': admin
+      {% endif %}

    relay:
        # Whether relay mode should be allowed. If allowed, `!fb set-relay` can be used to turn any
@@ -250,11 +253,11 @@ logging:
            formatter: colored
    loggers:
        mau:
-            level: DEBUG
+            level: WARNING
        paho:
-            level: INFO
+            level: WARNING
        aiohttp:
-            level: INFO
+            level: WARNING
    root:
-        level: DEBUG
+        level: WARNING
        handlers: [console]
--- a/roles/matrix-bridge-mautrix-googlechat/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-googlechat/templates/config.yaml.j2
@@ -119,6 +119,9 @@ bridge:
    #     mxid - Specific user
    permissions:
      '{{ matrix_mautrix_googlechat_homeserver_domain }}': user
+      {% if matrix_admin %}
+      '{{ matrix_admin }}': admin
+      {% endif %}

 # Python logging configuration.
 #
@@ -138,11 +141,11 @@ logging:
            formatter: colored
    loggers:
        mau:
-            level: DEBUG
+            level: WARNING
        hangups:
-            level: DEBUG
+            level: WARNING
        aiohttp:
-            level: INFO
+            level: WARNING
    root:
-        level: DEBUG
+        level: WARNING
        handlers: [console]
--- a/roles/matrix-bridge-mautrix-hangouts/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-hangouts/templates/config.yaml.j2
@@ -116,6 +116,9 @@ bridge:
    #     mxid - Specific user
    permissions:
      '{{ matrix_mautrix_hangouts_homeserver_domain }}': user
+      {% if matrix_admin %}
+      '{{ matrix_admin }}': admin
+      {% endif %}

 # Python logging configuration.
 #
@@ -135,11 +138,11 @@ logging:
            formatter: colored
    loggers:
        mau:
-            level: DEBUG
+            level: WARNING
        hangups:
-            level: DEBUG
+            level: WARNING
        aiohttp:
-            level: INFO
+            level: WARNING
    root:
-        level: DEBUG
+        level: WARNING
        handlers: [console]
--- a/roles/matrix-bridge-mautrix-instagram/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-instagram/templates/config.yaml.j2
@@ -166,7 +166,7 @@ bridge:
  # been sent to Instagram.
  delivery_receipts: false
  # Whether or not delivery errors should be reported as messages in the Matrix room.
-  delivery_error_reports: false
+  delivery_error_reports: true
  # Set this to true to tell the bridge to re-send m.bridge events to all rooms on the next run.
  # This field will automatically be changed back to false after it,
  # except if the config file is not writable.
@@ -187,6 +187,9 @@ bridge:
  #     mxid - Specific user
  permissions:
    "{{ matrix_mautrix_instagram_homeserver_domain }}": user
+    {% if matrix_admin %}
+    "{{ matrix_admin }}": admin
+    {% endif %}
  # Provisioning API part of the web server for automated portal creation and fetching information.
  # Used by things like mautrix-manager (https://github.com/tulir/mautrix-manager).
  provisioning:
@@ -216,13 +219,13 @@ logging:
      formatter: colored
  loggers:
    mau:
-      level: DEBUG
+      level: WARNING
    mauigpapi:
-      level: DEBUG
+      level: WARNING
    paho:
-      level: INFO
+      level: WARNING
    aiohttp:
-      level: INFO
+      level: WARNING
  root:
-    level: DEBUG
+    level: WARNING
    handlers: [console]
--- a/roles/matrix-bridge-mautrix-signal/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-signal/templates/config.yaml.j2
@@ -177,7 +177,7 @@ bridge:
    # Note that this is not related to Signal delivery receipts.
    delivery_receipts: false
    # Whether or not delivery errors should be reported as messages in the Matrix room. (not yet implemented)
-    delivery_error_reports: false
+    delivery_error_reports: true
    # Set this to true to tell the bridge to re-send m.bridge events to all rooms on the next run.
    # This field will automatically be changed back to false after it,
    # except if the config file is not writable.
@@ -225,6 +225,9 @@ bridge:
    #     mxid - Specific user
    permissions: 
        {{ matrix_mautrix_signal_bridge_permissions|from_yaml }}
+        {% if matrix_admin %}
+        "{{ matrix_admin }}": admin
+        {% endif %}

    relay:
        # Whether or not relay mode should be allowed. If allowed, `!signal set-relay` can be used to turn any
@@ -266,9 +269,9 @@ logging:
            formatter: colored
    loggers:
        mau:
-            level: {{ matrix_mautrix_signal_log_level }}
+            level: WARNING
        aiohttp:
-            level: INFO
+            level: WARNING
    root:
-        level: {{ matrix_mautrix_signal_log_level }}
+        level: WARNING
        handlers: [console]
--- a/roles/matrix-bridge-mautrix-telegram/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-telegram/templates/config.yaml.j2
@@ -105,11 +105,11 @@ bridge:
    # synced when they send messages. The maximum is 10000, after which the Telegram server
    # will not send any more members.
    # Defaults to no local limit (-> limited to 10000 by server)
-    max_initial_member_sync: -1
+    max_initial_member_sync: 10
    # Whether or not to sync the member list in channels.
    # If no channel admins have logged into the bridge, the bridge won't be able to sync the member
    # list regardless of this setting.
-    sync_channel_members: true
+    sync_channel_members: false
    # Whether or not to skip deleted members when syncing members.
    skip_deleted_members: true
    # Whether or not to automatically synchronize contacts and chats of Matrix users logged into
@@ -204,7 +204,7 @@ bridge:
    # been sent to Telegram.
    delivery_receipts: false
    # Whether or not delivery errors should be reported as messages in the Matrix room.
-    delivery_error_reports: false
+    delivery_error_reports: true
    # Set this to true to tell the bridge to re-send m.bridge events to all rooms on the next run.
    # This field will automatically be changed back to false after it,
    # except if the config file is not writable.
@@ -291,6 +291,9 @@ bridge:
    #     mxid - Specific user
    permissions:
      '{{ matrix_mautrix_telegram_homeserver_domain }}': full
+      {% if matrix_admin %}
+      '{{ matrix_admin }}': admin
+      {% endif %}

    # Options related to the message relay Telegram bot.
    relaybot:
@@ -401,11 +404,11 @@ logging:
            formatter: precise
    loggers:
        mau:
-            level: DEBUG
+            level: WARNING
        telethon:
-            level: DEBUG
+            level: WARNING
        aiohttp:
-            level: INFO
+            level: WARNING
    root:
-        level: DEBUG
+        level: WARNING
        handlers: [console]
--- a/roles/matrix-bridge-mautrix-twitter/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-twitter/templates/config.yaml.j2
@@ -149,7 +149,7 @@ bridge:
    # been sent to Twitter.
    delivery_receipts: false
    # Whether or not delivery errors should be reported as messages in the Matrix room.
-    delivery_error_reports: false
+    delivery_error_reports: true
    # Whether or not non-fatal polling errors should send notices to the notice room.
    temporary_disconnect_notices: true
    # Number of seconds to sleep more than the previous error when a polling error occurs.
@@ -175,6 +175,9 @@ bridge:
    #     mxid - Specific user
    permissions:
      '{{ matrix_mautrix_twitter_homeserver_domain }}': user
+      {% if matrix_admin %}
+      '{{ matrix_admin }}': admin
+      {% endif %}


 # Python logging configuration.
@@ -195,9 +198,9 @@ logging:
            formatter: colored
    loggers:
        mau:
-            level: DEBUG
+            level: WARNING
        aiohttp:
-            level: INFO
+            level: WARNING
    root:
-        level: DEBUG
+        level: WARNING
        handlers: [console]
--- a/roles/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2
@@ -187,6 +187,9 @@ bridge:
    #     mxid - Specific user
    permissions:
        "{{ matrix_mautrix_whatsapp_homeserver_domain }}": user
+        {% if matrix_admin %}
+        "{{ matrix_admin }}": admin
+        {% endif %}

    # Settings for relay mode
    relay:
--- a/roles/matrix-bridge-mx-puppet-discord/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mx-puppet-discord/templates/config.yaml.j2
@@ -25,7 +25,7 @@ presence:
  # Bridge Discord online/offline status
  enabled: true
  # How often to send status to the homeserver in milliseconds
-  interval: 500
+  interval: 5000

 provisioning:
  # Regex of Matrix IDs allowed to use the puppet bridge
@@ -117,7 +117,7 @@ logging:
  # Log level of console output
  # Allowed values starting with most verbose:
  # silly, debug, verbose, info, warn, error
-  console: info
+  console: warn
  # Date and time formatting
  lineDateFormat: MMM-D HH:mm:ss.SSS
  # Logging files
--- a/roles/matrix-bridge-mx-puppet-groupme/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mx-puppet-groupme/templates/config.yaml.j2
@@ -78,7 +78,7 @@ logging:
  # Log level of console output
  # Allowed values starting with most verbose:
  # silly, debug, verbose, info, warn, error
-  console: info
+  console: warn
  # Date and time formatting
  lineDateFormat: MMM-D HH:mm:ss.SSS
  # Logging files
--- a/roles/matrix-bridge-mx-puppet-instagram/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mx-puppet-instagram/templates/config.yaml.j2
@@ -18,7 +18,7 @@ presence:
  # Bridge Instagram online/offline status
  enabled: true
  # How often to send status to the homeserver in milliseconds
-  interval: 500
+  interval: 5000

 provisioning:
  # Regex of Matrix IDs allowed to use the puppet bridge
@@ -61,7 +61,7 @@ logging:
  # Log level of console output
  # Allowed values starting with most verbose:
  # silly, debug, verbose, info, warn, error
-  console: info
+  console: warn
  # Date and time formatting
  lineDateFormat: MMM-D HH:mm:ss.SSS
  # Logging files
--- a/roles/matrix-bridge-mx-puppet-skype/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mx-puppet-skype/templates/config.yaml.j2
@@ -29,7 +29,7 @@ logging:
  # Log level of console output
  # Allowed values starting with most verbose:
  # silly, debug, verbose, info, warn, error
-  console: info
+  console: warn
  # Optionally, you can apply filters to the console logging
  #console:
  #  level: info
@@ -80,7 +80,7 @@ presence:
  # Bridge online/offline status
  enabled: true
  # How often to send status to the homeserver in milliseconds
-  interval: 500
+  interval: 5000
  # if the im.vector.user_status state setting should be diabled
  #disableStatusState: false
  # A blacklist of remote user IDs for the im.vector.user_status state setting
--- a/roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2
@@ -32,7 +32,7 @@ presence:
  # Bridge Discord online/offline status
  enabled: true
  # How often to send status to the homeserver in milliseconds
-  interval: 500
+  interval: 5000

 provisioning:
  # Regex of Matrix IDs allowed to use the puppet bridge
@@ -75,7 +75,7 @@ logging:
  # Log level of console output
  # Allowed values starting with most verbose:
  # silly, debug, verbose, info, warn, error
-  console: info
+  console: warn
  # Date and time formatting
  lineDateFormat: MMM-D HH:mm:ss.SSS
  # Logging files
--- a/roles/matrix-bridge-mx-puppet-steam/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mx-puppet-steam/templates/config.yaml.j2
@@ -78,7 +78,7 @@ logging:
  # Log level of console output
  # Allowed values starting with most verbose:
  # silly, debug, verbose, info, warn, error
-  console: info
+  console: warn
  # Date and time formatting
  lineDateFormat: MMM-D HH:mm:ss.SSS
  # Logging files
--- a/roles/matrix-bridge-mx-puppet-twitter/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mx-puppet-twitter/templates/config.yaml.j2
@@ -28,7 +28,7 @@ presence:
  # Bridge Twitter online/offline status
  enabled: true
  # How often to send status to the homeserver in milliseconds
-  interval: 500
+  interval: 5000

 provisioning:
  # Regex of Matrix IDs allowed to use the puppet bridge
@@ -71,7 +71,7 @@ logging:
  # Log level of console output
  # Allowed values starting with most verbose:
  # silly, debug, verbose, info, warn, error
-  console: info
+  console: warn
  # Date and time formatting
  lineDateFormat: MMM-D HH:mm:ss.SSS
  # Logging files