Merge changes I3b66b586,Ib9052c14,I50f33935

* changes:
  matrix: bump version and remove default options
  app/matrix: matrix.hackerspace.pl: add libera.chat static mappings
  app/matrix: appservice-irc: use secret in bootstrap job

app/matrix/lib/appservice-irc.libsonnet

@@ -70,7 +70,7 @@ local kube = import "../../../kube/kube.libsonnet";
                 template+: {
                     spec+: {
                         volumes_: {
-                            config: kube.ConfigMapVolume(bridge.config),
+                            config: kube.SecretVolume(bridge.config),
                         },
                         containers_: {
                             bootstrap: kube.Container("appservice-irc-%s-bootstrap" % [name]) {

app/matrix/lib/matrix-ng.libsonnet

@@ -62,7 +62,7 @@ local synapse = import "./synapse.libsonnet";
         storageClassName: "waw-hdd-redundant-3",
 
         images: {
-            synapse: "matrixdotorg/synapse:v1.25.0",
+            synapse: "matrixdotorg/synapse:v1.35.1",
             riot: "vectorim/riot-web:v1.7.18",
             casProxy: "registry.k0.hswaw.net/q3k/oauth2-cas-proxy:0.1.4",
             appserviceIRC: "matrixdotorg/matrix-appservice-irc:release-0.26.0",

app/matrix/lib/synapse/homeserver-ng.yaml

@@ -105,12 +105,6 @@ report_stats: False
 
 ## API Configuration ##
 
-room_invite_state_types:
-    - "m.room.join_rules"
-    - "m.room.canonical_alias"
-    - "m.room.avatar"
-    - "m.room.name"
-
 expire_access_token: False
 
 ## Signing Keys ##

app/matrix/matrix.hackerspace.pl.jsonnet

@@ -56,15 +56,15 @@ matrix {
                         servers+: {
                             local servers = self,
                             "irc.freenode.net"+: {
-                                mappings+: import "secrets/plain/appservice-irc-freenode-mappings.jsonnet",
+                                mappings+: {},
                                 ircClients+: {
                                     maxClients: 150,
                                 },
                             },
                             "irc.libera.chat": servers["irc.freenode.net"] {
-                                mappings: {},
+                                mappings+: import "secrets/plain/appservice-irc-libera-mappings.jsonnet",
                                 ircClients+: {
-                                    maxClients: 20,
+                                    maxClients: 150,
                                 },
                                 name: "Libera Chat",
                                 networkId: "libera",

app/matrix/secrets/cipher/appservice-irc-freenode-mappings.jsonnet

@@ -1,29 +0,0 @@
------BEGIN PGP MESSAGE-----
-
-hQEMAzhuiT4RC8VbAQf/WtXUDVxZS6kGiCvfebsc20kVpLWCrgb8Yx+Jc91M8Sh1
-3cAqxE41kis7tXgeFVsw6gR04r3IJkF8Xjywhohmu7QteW6uPQ6rYUXFjIDuPdur
-RgpoeolgfrhWZ1Ea5YUIIfAbwTOdca3/VLwA/QSYCUCr9FiZ3utL4jXWyukayfDN
-u+9mPa+0oANyDTrRlaKj9wp/jfoDfEoJ3gucaQoE0XJsmaHl3XLX0YC2Y4599Vmw
-WxK/4NxIlfLHz+bskLlBaaHTZm5cipkrrNiyF63W4/3G3AxALOQfBAYnGjI2j+NO
-G3sBZvu22vW0kxOiD+NaQciSZY65SmRjVeqjuoXVIYUBDANcG2tp6fXqvgEIALSh
-osli8DG5feBQLXzv/Vs4loTuB2COJ29IyjzKQo0NoeScJgz4NU/K/pWKZOsYCPjy
-VV0jt2ZVUAD4j8ahmwzlEN1hvuphtd+WHM5O68if9KfDNcCML5qJOw7uVF3leAgM
-KVVyteDc22paM9s++nOFJdaaUpGAWlqsucCOT7glBmUyPMIRSSnWDLXL97GfLRdM
-JDTqR4MvZA2GilOeB/RYUNjHN22RDYFyAE7jrJ8soLWLhFOddLpMqKMZIxWh/NyA
-okM2i999VKN20HTBsbfdyExQx49djrLngADKJZs6czvqa1dxE/+PKFrBKO+MCNTP
-nqyFaRTKaPnoKJWymd+FAgwD4gPJTlzrs+8BEACd+ScJWkk55ntTsi9nJe3qf/Cw
-Xxi/M+plY/kmpryMJIhiZ4CqacGhLF3GVsKgaLTBzHRrdgJL+DACbC2uCsjl2UcX
-e0wal4Jf6H5E87fSxLIwgtaHPvQApMRCg1sueR71mYvGTLqYhjn/jhh0ydzGhZ95
-/iXAgtHRSQtxAzAYDsSVcHgxPELlZ4/xiuUfqjX9Qs7u52j997qsLMnlAsqBsZ/6
-CuC4Wcy/liRL7kERZ4ZkKu1cL9eDAiCZUsUWaFtHknsvfhRvmAmBN7vSDNb1hRFI
-6O+p5YLv1AMYfiQAhpYDKiTyPZ9+ZJKM50QnjKJ3cE8pDe9zDeFsLOGwhBL6svn6
-bFHDlsQJqWxZQRD0DfC6f+GFvYl1o7Zg3tSkBejq+vCESIRgC4fiifCBWW9TlMiI
-TrbRpBgBPQnzt5T+LzaWAlNkhGPe87C8tHZd15UZ4SNKxaEyruB84qylz+Nvt8jl
-CIxcJO13zRstvTBSvbmvG4ZZrkb4dApUTOYA8HNpeeVmU2Dem7uQHgLPmqSvyerP
-eP7O6mJ3QOuotl3jqVlwSZw2+8m2IfPGCQCtDrgQV3pzg3mvEJjftWgAzF4u/7Ea
-42o98+QCK4x/VFmLYuFD04MlNY7Ctkuccv4kFeJm9ee0Y81Nvs/ZXcO+UzXWWfRW
-4UwA0txqM24bkDaAb9JmAV2/AEGyySo75Gjhu8jODoj9ZnRWO+IRBSvedittOogW
-CTsFX1pG4YGw3SdUUrtJWn3uVjxdDloZUFWzWZ2KOOIe/S8ipChi/rkgk3k6HwnW
-pK3jT5vP6QeRLp9hp5yXBp+65Jmt
-=G6Xz
------END PGP MESSAGE-----

app/matrix/secrets/cipher/appservice-irc-libera-mappings.jsonnet

@@ -0,0 +1,42 @@
+-----BEGIN PGP MESSAGE-----
+
+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
+byK/cJOHpY5uj94G
+=TR11
+-----END PGP MESSAGE-----