bundles/matrix*: fix directories/repos
This commit is contained in:
parent
46fcd1670f
commit
905a7917f8
5 changed files with 22 additions and 10 deletions
|
@ -5,14 +5,6 @@ defaults = {
|
|||
'imagemagick': {},
|
||||
'ffmpeg': {},
|
||||
},
|
||||
'repos': {
|
||||
'backports': {
|
||||
'install_gpg_key': False, # default debian signing key
|
||||
'items': {
|
||||
'deb http://deb.debian.org/debian {os_release}-backports main',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
'backups': {
|
||||
'paths': {
|
||||
|
@ -75,6 +67,16 @@ defaults = {
|
|||
},
|
||||
}
|
||||
|
||||
if node.os == 'debian' and node.os_version[0] <= 10:
|
||||
defaults['apt']['repos'] = {
|
||||
'backports': {
|
||||
'install_gpg_key': False, # default debian signing key
|
||||
'items': {
|
||||
'deb http://deb.debian.org/debian {os_release}-backports main',
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@metadata_reactor.provides(
|
||||
'matrix-media-repo/workers',
|
||||
|
|
|
@ -5,7 +5,7 @@ defaults = {
|
|||
'repos': {
|
||||
'matrix': {
|
||||
'items': {
|
||||
'deb https://packages.matrix.org/debian buster main',
|
||||
'deb https://packages.matrix.org/{os} {os_release} main',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
@ -32,6 +32,7 @@ users = {
|
|||
}
|
||||
|
||||
directories = {
|
||||
'/opt/mautrix-telegram': {},
|
||||
'/opt/mautrix-telegram/src': {},
|
||||
}
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ users = {
|
|||
}
|
||||
|
||||
directories = {
|
||||
'/opt/mautrix-whatsapp': {},
|
||||
'/opt/mautrix-whatsapp/src': {},
|
||||
'/opt/mautrix-whatsapp/logs': {
|
||||
'owner': 'mautrix-whatsapp',
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
repo.libs.tools.require_bundle(node, 'nodejs')
|
||||
|
||||
directories = {
|
||||
'/opt/mx-puppet-discord': {},
|
||||
'/opt/mx-puppet-discord/.npm': {
|
||||
'owner': 'mx-puppet-discord',
|
||||
'group': 'mx-puppet-discord',
|
||||
},
|
||||
'/opt/mx-puppet-discord/src': {
|
||||
'owner': 'mx-puppet-discord',
|
||||
'group': 'mx-puppet-discord',
|
||||
|
@ -54,8 +59,11 @@ git_deploy = {
|
|||
|
||||
actions = {
|
||||
'mx-puppet-discord_chown': {
|
||||
'command': 'chown -R mx-puppet-discord:mx-puppet-discord /opt/mx-puppet-discord/src',
|
||||
'command':
|
||||
'chown -R mx-puppet-discord:mx-puppet-discord /opt/mx-puppet-discord/src && '
|
||||
'chown -R mx-puppet-discord:mx-puppet-discord /opt/mx-puppet-discord/.npm',
|
||||
'needs': {
|
||||
'directory:/opt/mx-puppet-discord/.npm',
|
||||
'user:mx-puppet-discord',
|
||||
},
|
||||
'triggered': True,
|
||||
|
|
Loading…
Reference in a new issue