nodes/htz.ex42-1048908: move postgres roles and databases to bundles
All checks were successful
bundlewrap/pipeline/head This commit looks good
All checks were successful
bundlewrap/pipeline/head This commit looks good
This commit is contained in:
parent
033adc1f0b
commit
943a7c1566
3 changed files with 25 additions and 19 deletions
|
@ -32,4 +32,16 @@ def synapse_defaults(metadata):
|
||||||
'database': 'synapse',
|
'database': 'synapse',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
'postgresql': {
|
||||||
|
'users': {
|
||||||
|
'synapse_user': {
|
||||||
|
'password': repo.vault.password_for('{} postgresql synapse_user'.format(node.name)),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
'databases': {
|
||||||
|
'synapse': {
|
||||||
|
'owner': 'synapse_user',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
}, DEFAULTS, DONE
|
}, DEFAULTS, DONE
|
||||||
|
|
|
@ -21,7 +21,7 @@ def add_mx_puppet_discord_to_synapse(metadata):
|
||||||
}, DEFAULTS, DONE
|
}, DEFAULTS, DONE
|
||||||
|
|
||||||
@metadata_processor
|
@metadata_processor
|
||||||
def bridge_defaults(metadata):
|
def postgres(metadata):
|
||||||
return {
|
return {
|
||||||
'mx-puppet-discord': {
|
'mx-puppet-discord': {
|
||||||
'database': {
|
'database': {
|
||||||
|
@ -30,5 +30,17 @@ def bridge_defaults(metadata):
|
||||||
'database': 'mx-puppet-discord',
|
'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
|
}, DEFAULTS, DONE
|
||||||
|
|
||||||
|
|
|
@ -76,24 +76,6 @@ nodes['htz.ex42-1048908'] = {
|
||||||
'permalinkPrefix': 'https://chat.franzi.business',
|
'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': {
|
'users': {
|
||||||
'feli': {
|
'feli': {
|
||||||
'ssh_pubkey': [
|
'ssh_pubkey': [
|
||||||
|
|
Loading…
Add table
Reference in a new issue