update matrix-media-repo to 1.3.1

bundles/matrix-media-repo/files/config.yaml

@@ -1,7 +1,7 @@
 # General repo configuration
 repo:
-  bindAddress: '${node.metadata['matrix-media-repo'].get('listen-addr', '127.0.0.1')}'
+  bindAddress: '${node.metadata.get('matrix-media-repo/listen-addr', '127.0.0.1')}'
-  port: ${node.metadata['matrix-media-repo'].get('port', 20090)}
+  port: ${node.metadata.get('matrix-media-repo/port', 20090)}
   logDirectory: '-'
   trustAnyForwardedAddress: false
   useForwardedHost: true
@@ -10,14 +10,14 @@ federation:
   backoffAt: 20
 
 database:
-  postgres: "postgres://${node.metadata['matrix-media-repo']['database']['user']}:${node.metadata['matrix-media-repo']['database']['password']}@${node.metadata['matrix-media-repo']['database'].get('host', 'localhost')}/${node.metadata['matrix-media-repo']['database']['database']}?sslmode=disable"
+  postgres: "postgres://${node.metadata.get('matrix-media-repo/database/user')}:${node.metadata.get('matrix-media-repo/database/password')}@${node.metadata.get('matrix-media-repo/database/host', 'localhost')}/${node.metadata.get('matrix-media-repo/database/database')}?sslmode=disable"
 
   pool:
     maxConnections: 25
     maxIdleConnections: 5
 
 homeservers:
-% for homeserver, config in node.metadata['matrix-media-repo'].get('homeservers', {}).items():
+% for homeserver, config in node.metadata.get('matrix-media-repo/homeservers').items():
   - name: ${homeserver}
     csApi: "${config['domain']}"
     backoffAt: ${config.get('backoff_at', 10)}
@@ -29,45 +29,42 @@ accessTokens:
   useLocalAppserviceConfig: false
 
 admins:
-% for user in sorted(node.metadata['matrix-media-repo']['admins']):
+% for user in sorted(node.metadata.get('matrix-media-repo/admins')):
   - "${user}"
 % endfor
 
 sharedSecretAuth:
   enabled: false
-  token: "${node.metadata['matrix-media-repo']['shared-secret-token']}"
+  token: "${node.metadata.get('matrix-media-repo/shared-secret-token')}"
 
 datastores:
   - type: file
+    id: "${node.metadata.get('matrix-media-repo/datastore_id')}"
     enabled: true
-    forKinds:
+    forKinds: ['all']
-      - 'thumbnails'
-      - 'remote_media'
-      - 'local_media'
-      - 'archives'
     opts:
       path: /var/matrix/media
 
 archiving:
   enabled: true
-  selfService: ${str(node.metadata['matrix-media-repo']['archive']['self-service']).lower()}
+  selfService: ${str(node.metadata.get('matrix-media-repo/archive/self-service')).lower()}
-  targetBytesPerPart: ${node.metadata['matrix-media-repo']['archive'].get('mb_per_part', node.metadata['matrix-media-repo']['upload_max_mb']*2)*1024*1024}
+  targetBytesPerPart: ${node.metadata.get('matrix-media-repo/archive/mb_per_part', node.metadata.get('matrix-media-repo/upload_max_mb')*2)*1024*1024}
 
 uploads:
-  maxBytes: ${node.metadata['matrix-media-repo']['upload_max_mb']*1024*1024}
+  maxBytes: ${node.metadata.get('matrix-media-repo/upload_max_mb')*1024*1024}
   minBytes: 100
   reportedMaxBytes: 0
   quotas:
     enabled: false
 
 downloads:
-  maxBytes: ${node.metadata['matrix-media-repo']['download_max_mb']*1024*1024}
+  maxBytes: ${node.metadata.get('matrix-media-repo/download_max_mb')*1024*1024}
-  numWorkers: ${node.metadata['matrix-media-repo']['workers']}
+  numWorkers: ${node.metadata.get('matrix-media-repo/workers')}
   failureCacheMinutes: 5
   cache:
     enabled: true
-    maxSizeBytes: ${node.metadata['matrix-media-repo']['download_max_mb']*10*1024*1024}
+    maxSizeBytes: ${node.metadata.get('matrix-media-repo/download_max_mb')*10*1024*1024}
-    maxFileSizeBytes: ${node.metadata['matrix-media-repo']['upload_max_mb']*1024*1024}
+    maxFileSizeBytes: ${node.metadata.get('matrix-media-repo/download_max_mb')*1024*1024}
     trackedMinutes: 30
     minDownloads: 5
     minCacheTimeSeconds: 300
@@ -76,7 +73,7 @@ downloads:
 
 urlPreviews:
   enabled: true
-  maxPageSizeBytes: ${node.metadata['matrix-media-repo']['preview_max_mb']*1024*1024}
+  maxPageSizeBytes: ${node.metadata.get('matrix-media-repo/preview_max_mb')*1024*1024}
   previewUnsafeCertificates: false
   numWords: 50
   maxLength: 200
@@ -84,7 +81,7 @@ urlPreviews:
   maxTitleLength: 150
   filePreviewTypes:
     - "image/*"
-  numWorkers: ${node.metadata['matrix-media-repo']['workers']}
+  numWorkers: ${node.metadata.get('matrix-media-repo/workers')}
   disallowedNetworks:
     - "127.0.0.1/8"
     - "10.0.0.0/8"
@@ -103,8 +100,8 @@ urlPreviews:
   oEmbed: false
 
 thumbnails:
-  maxSourceBytes: ${node.metadata['matrix-media-repo']['preview_max_mb']*1024*1024}
+  maxSourceBytes: ${node.metadata.get('matrix-media-repo/preview_max_mb')*1024*1024}
-  numWorkers: ${node.metadata['matrix-media-repo']['workers']}
+  numWorkers: ${node.metadata.get('matrix-media-repo/workers')}
   sizes:
     - width: 32
       height: 32
@@ -134,7 +131,7 @@ thumbnails:
     - "video/mp4"
   allowAnimated: true
   defaultAnimated: false
-  maxAnimateSizeBytes: ${node.metadata['matrix-media-repo']['preview_max_mb']*1024*1024}
+  maxAnimateSizeBytes: ${node.metadata.get('matrix-media-repo/preview_max_mb')*1024*1024}
   stillFrame: 0.5
   expireAfterDays: 0
 

nodes/carlene.toml

@@ -29,6 +29,9 @@ bundles = [
     "zfs",
 ]
 
+# for auto-deployment of salonkatrin.de
+[metadata.apt.packages.jekyll]
+
 [metadata.check-mail-received.t-online]
 email = "franzi.kunsmann@t-online.de"
 imap_host = "secureimap.t-online.de"
@@ -65,9 +68,10 @@ gateway6 = "2a0a:51c0:0:225::1"
 
 [metadata.matrix-media-repo]
 admins = ["@kunsi:franzi.business"]
-sha1 = "0915bdf7c461368859180419d1f66717969cbe32"
+datastore_id = "3fff5da324ed784c771d638bb6be5917"
+sha1 = "0f9e686f9538baa059eba91e56b320e38ae6125b"
 upload_max_mb = 500
-version = "v1.2.13"
+version = "v1.3.1"
 [metadata.matrix-media-repo.homeservers.'franzi.business']
 api = "synapse"
 domain = "http://[::1]:20080/"

nodes/htz-cloud.afra.toml

@@ -42,10 +42,11 @@ defaultCountryCode = "DE"
 jitsi.preferredDomain = "meet.ffmuc.net"
 
 [metadata.matrix-media-repo]
-version = "v1.2.13"
-sha1 = "0915bdf7c461368859180419d1f66717969cbe32"
 admins = ['@administress:afra.berlin']
+datastore_id = "e33b50474021fba9977f912414cdd7fe8890ed57"
+sha1 = "0f9e686f9538baa059eba91e56b320e38ae6125b"
 upload_max_mb = 50
+version = "v1.3.1"
 
 [metadata.matrix-media-repo.homeservers.'afra.berlin']
 domain = "http://[::1]:20080/"

nodes/htz-cloud/miniserver.py

@@ -113,8 +113,9 @@ nodes['htz-cloud.miniserver'] = {
             },
         },
         'matrix-media-repo': {
-            'version': 'v1.2.13',
+            'version': 'v1.3.1',
-            'sha1': '0915bdf7c461368859180419d1f66717969cbe32',
+            'datastore_id': '99c09e24edc4e9be6c4c9486bc147e385bc87044',
+            'sha1': '0f9e686f9538baa059eba91e56b320e38ae6125b',
             'homeservers': {
                 'sophies-kitchen.eu': {
                     'domain': 'http://[::1]:20080/',