update to bw4
This commit is contained in:
parent
d7862918a6
commit
5e2fea8497
22 changed files with 223 additions and 501 deletions
|
@ -31,9 +31,6 @@ git_deploy = {
|
|||
'/opt/mx-puppet-discord': {
|
||||
'repo': 'https://github.com/matrix-discord/mx-puppet-discord.git',
|
||||
'rev': 'master',
|
||||
'needs': {
|
||||
'directory:/opt/mx-puppet-discord',
|
||||
},
|
||||
'triggers': {
|
||||
'action:mx-puppet-discord_chown',
|
||||
'action:mx-puppet-discord_npm_install',
|
||||
|
|
|
@ -1,46 +1,33 @@
|
|||
@metadata_processor
|
||||
def mx_puppet_discord_user(metadata):
|
||||
return {
|
||||
defaults = {
|
||||
'users': {
|
||||
'mx-puppet-discord': {
|
||||
'home': '/opt/mx-puppet-discord',
|
||||
'deploy_configs': False,
|
||||
'home-mode': '0755',
|
||||
},
|
||||
},
|
||||
'matrix-synapse': {
|
||||
'appservice_configs': {
|
||||
'/opt/mx-puppet-discord/registration.yaml',
|
||||
},
|
||||
},
|
||||
'mx-puppet-discord': {
|
||||
'database': {
|
||||
'user': 'mx-puppet-discord',
|
||||
'password': repo.vault.password_for('{} postgresql mx-puppet-discord'.format(node.name)),
|
||||
'database': 'mx-puppet-discord',
|
||||
},
|
||||
},
|
||||
'postgres': {
|
||||
'users': {
|
||||
'mx-puppet-discord': {
|
||||
'home': '/opt/mx-puppet-discord',
|
||||
'deploy_configs': False,
|
||||
'home-mode': '0755',
|
||||
},
|
||||
},
|
||||
}, DEFAULTS, DONE
|
||||
|
||||
@metadata_processor
|
||||
def add_mx_puppet_discord_to_synapse(metadata):
|
||||
return {
|
||||
'matrix-synapse': {
|
||||
'appservice_configs': {
|
||||
'/opt/mx-puppet-discord/registration.yaml',
|
||||
},
|
||||
},
|
||||
}, DEFAULTS, DONE
|
||||
|
||||
@metadata_processor
|
||||
def postgres(metadata):
|
||||
return {
|
||||
'mx-puppet-discord': {
|
||||
'database': {
|
||||
'user': 'mx-puppet-discord',
|
||||
'password': repo.vault.password_for('{} postgresql mx-puppet-discord'.format(node.name)),
|
||||
'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',
|
||||
},
|
||||
'databases': {
|
||||
'mx-puppet-discord': {
|
||||
'owner': 'mx-puppet-discord',
|
||||
},
|
||||
},
|
||||
}, DEFAULTS, DONE
|
||||
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue