backups: Remove empty keys in backup manifest data

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Joseph Nuthalapati 2018-09-28 10:45:33 -07:00 committed by James Valleroy
parent 6b8b40cda6
commit d48ab72cf0
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
9 changed files with 18 additions and 79 deletions

View File

@ -17,18 +17,4 @@
from plinth.modules.backups.backups import validate as validate_backup
backup = validate_backup({
'config': {
'directories': ['/etc/ez-ipupdate/'],
'files': [],
},
'data': {
'directories': [],
'files': [],
},
'secrets': {
'directories': [],
'files': [],
},
'services': []
})
backup = validate_backup({'config': {'directories': ['/etc/ez-ipupdate/']}})

View File

@ -124,16 +124,13 @@ clients = _clients
backup = validate_backup({
'config': {
'directories': [],
'files': ['/etc/ejabberd/ejabberd.yml'],
'files': ['/etc/ejabberd/ejabberd.yml']
},
'data': {
'directories': ['/var/lib/ejabberd/'],
'files': [],
'directories': ['/var/lib/ejabberd/']
},
'secrets': {
'directories': [],
'files': ['/etc/ejabberd/ejabberd.pem'],
'files': ['/etc/ejabberd/ejabberd.pem']
},
'services': ['ejabberd']
})

View File

@ -29,17 +29,7 @@ clients = validate([{
}])
backup = validate_backup({
'config': {
'directories': [],
'files': [],
},
'data': {
'directories': ['/var/lib/ikiwiki/', '/var/www/ikiwiki/'],
'files': [],
},
'secrets': {
'directories': [],
'files': [],
},
'services': []
'directories': ['/var/lib/ikiwiki/', '/var/www/ikiwiki/']
}
})

View File

@ -48,16 +48,10 @@ clients = validate([{
}])
backup = validate_backup({
'config': {
'directories': [],
'files': [],
},
'data': {
'directories': ['/var/lib/infinoted/'],
'files': [],
'directories': ['/var/lib/infinoted/']
},
'secrets': {
'directories': [],
'files': [
'/etc/infinoted/infinoted-cert.pem',
'/etc/infinoted/infinoted-key.pem'

View File

@ -60,23 +60,22 @@ backup = validate_backup({
'files': [
'/etc/matrix-synapse/homeserver.yaml',
'/etc/matrix-synapse/log.yaml'
],
]
},
'data': {
'directories': [
'/var/lib/matrix-synapse/media/',
'/var/lib/matrix-synapse/uploads/'
],
'files': ['/var/lib/matrix-synapse/homeserver.db'],
'files': ['/var/lib/matrix-synapse/homeserver.db']
},
'secrets': {
'directories': [],
'files': [
'/etc/matrix-synapse/homeserver.signing.key',
'/etc/matrix-synapse/homeserver.tls.crt',
'/etc/matrix-synapse/homeserver.tls.dh',
'/etc/matrix-synapse/homeserver.tls.key'
],
]
},
'services': ['matrix-synapse']
})

View File

@ -29,17 +29,7 @@ clients = validate([{
}])
backup = validate_backup({
'config': {
'directories': [],
'files': [],
},
'data': {
'directories': ['/var/lib/mediawiki-db/'],
'files': [],
},
'secrets': {
'directories': [],
'files': [],
},
'services': []
'directories': ['/var/lib/mediawiki-db/']
}
})

View File

@ -54,16 +54,10 @@ clients = validate([{
backup = validate_backup({
'config': {
'directories': [],
'files': ['/etc/minetest/minetest.conf'],
'files': ['/etc/minetest/minetest.conf']
},
'data': {
'directories': ['/var/games/minetest-server/'],
'files': [],
},
'secrets': {
'directories': [],
'files': [],
'directories': ['/var/games/minetest-server/']
},
'services': ['minetest-server']
})

View File

@ -88,17 +88,8 @@ clients = validate([{
}])
backup = validate_backup({
'config': {
'directories': [],
'files': [],
},
'data': {
'directories': ['/var/lib/radicale/'],
'files': [],
},
'secrets': {
'directories': [],
'files': [],
'directories': ['/var/lib/radicale/']
},
'services': ['radicale']
})

View File

@ -77,16 +77,14 @@ clients = validate([{
backup = validate_backup({
'config': {
'directories': [],
'files': ['/etc/repro/repro.config', '/etc/repro/users.txt'],
'files': ['/etc/repro/repro.config', '/etc/repro/users.txt']
},
'data': {
'directories': ['/var/lib/repro/'],
'files': [],
'directories': ['/var/lib/repro/']
},
'secrets': {
'directories': ['/etc/repro/ssl/'],
'files': ['/etc/repro/dh2048.pem'],
'files': ['/etc/repro/dh2048.pem']
},
'services': ['repro']
})