nodes/htz.ex42-1048908: move postgres roles and databases to bundles

bundles/matrix-synapse/metadata.py

@@ -32,4 +32,16 @@ def synapse_defaults(metadata):
                 'database': 'synapse',
             },
         },
+        'postgresql': {
+            'users': {
+                'synapse_user': {
+                    'password': repo.vault.password_for('{} postgresql synapse_user'.format(node.name)),
+                },
+            },
+            'databases': {
+                'synapse': {
+                    'owner': 'synapse_user',
+                },
+            },
+        }
     }, DEFAULTS, DONE

bundles/mx-puppet-discord/metadata.py

@@ -21,7 +21,7 @@ def add_mx_puppet_discord_to_synapse(metadata):
     }, DEFAULTS, DONE
 
 @metadata_processor
-def bridge_defaults(metadata):
+def postgres(metadata):
     return {
         'mx-puppet-discord': {
             'database': {
@@ -30,5 +30,17 @@ def bridge_defaults(metadata):
                 'database': 'mx-puppet-discord',
             },
         },
+        'postgres': {
+            'users': {
+                'mx-puppet-discord': {
+                    'password': repo.vault.password_for('{} postgresql mx-puppet-discord'.format(node.name)),
+                },
+            },
+            'databases': {
+                'mx-puppet-discord': {
+                    'owner': 'mx-puppet-discord',
+                },
+            },
+        },
     }, DEFAULTS, DONE
 

nodes/htz/ex42-1048908.py

@@ -76,24 +76,6 @@ nodes['htz.ex42-1048908'] = {
                 'permalinkPrefix': 'https://chat.franzi.business',
             },
         },
-        'postgresql': {
-            'users': {
-                'mx-puppet-discord': {
-                    'password': vault.password_for('htz.ex42-1048908 postgresql mx-puppet-discord'),
-                },
-                'synapse_user': {
-                    'password': vault.password_for('htz.ex42-1048908 postgresql synapse_user'),
-                },
-            },
-            'databases': {
-                'mx-puppet-discord': {
-                    'owner': 'mx-puppet-discord',
-                },
-                'synapse': {
-                    'owner': 'synapse_user',
-                },
-            },
-        },
         'users': {
             'feli': {
                 'ssh_pubkey': [