backups: Remove empty keys in backup manifest data

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>

plinth/modules/dynamicdns/manifest.py

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

plinth/modules/ejabberd/manifest.py

@@ -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/'],
+        'directories': ['/var/lib/ejabberd/']
-        'files': [],
     },
     'secrets': {
-        'directories': [],
+        'files': ['/etc/ejabberd/ejabberd.pem']
-        'files': ['/etc/ejabberd/ejabberd.pem'],
     },
     'services': ['ejabberd']
 })

plinth/modules/ikiwiki/manifest.py

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

plinth/modules/infinoted/manifest.py

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

plinth/modules/matrixsynapse/manifest.py

@@ -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']
 })

plinth/modules/mediawiki/manifest.py

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

plinth/modules/minetest/manifest.py

@@ -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/'],
+        'directories': ['/var/games/minetest-server/']
-        'files': [],
-    },
-    'secrets': {
-        'directories': [],
-        'files': [],
     },
     'services': ['minetest-server']
 })

plinth/modules/radicale/manifest.py

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

plinth/modules/repro/manifest.py

@@ -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/'],
+        'directories': ['/var/lib/repro/']
-        'files': [],
     },
     'secrets': {
         'directories': ['/etc/repro/ssl/'],
-        'files': ['/etc/repro/dh2048.pem'],
+        'files': ['/etc/repro/dh2048.pem']
     },
     'services': ['repro']
 })