nodes/htz.ex42-1048908: move postgres roles and databases to bundles
All checks were successful
bundlewrap/pipeline/head This commit looks good

This commit is contained in:
Franzi 2020-06-01 11:09:03 +02:00
parent 033adc1f0b
commit 943a7c1566
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 25 additions and 19 deletions

View file

@ -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

View file

@ -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

View file

@ -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': [