cfg: Drop unused actions_dir option

Tests:

- Unit tests pass

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2025-11-17 12:05:59 -08:00 committed by James Valleroy
parent a7ec37dbce
commit 4371e2475d
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
5 changed files with 3 additions and 8 deletions

View File

@ -15,7 +15,6 @@ file_root = '/usr/share/plinth'
data_dir = '/var/lib/plinth'
custom_static_dir = '/var/www/plinth/custom/static'
store_file = data_dir + '/plinth.sqlite3'
actions_dir = '/usr/share/plinth/actions'
doc_dir = '/usr/share/freedombox'
server_dir = '/plinth'
@ -113,7 +112,6 @@ def read_file(config_path):
('Path', 'data_dir', 'string'),
('Path', 'custom_static_dir', 'string'),
('Path', 'store_file', 'string'),
('Path', 'actions_dir', 'string'),
('Path', 'doc_dir', 'string'),
('Path', 'server_dir', 'string'),
('Network', 'host', 'string'),

View File

@ -65,9 +65,9 @@ def fixture_load_cfg():
from plinth import cfg
keys = ('file_root', 'data_dir', 'custom_static_dir', 'store_file',
'actions_dir', 'doc_dir', 'server_dir', 'host', 'port',
'use_x_forwarded_for', 'use_x_forwarded_host',
'secure_proxy_ssl_header', 'box_name', 'develop')
'doc_dir', 'server_dir', 'host', 'port', 'use_x_forwarded_for',
'use_x_forwarded_host', 'secure_proxy_ssl_header', 'box_name',
'develop')
saved_state = {}
for key in keys:
saved_state[key] = getattr(cfg, key)

View File

@ -1,4 +1,3 @@
[Path]
file_root = %(parent_parent_dir)s
actions_dir = %(file_root)s/actions
doc_dir = %(file_root)s/doc

View File

@ -2,7 +2,6 @@
file_root = %(parent_dir)s
data_dir = %(file_root)s/data/var/lib/plinth
server_dir = /plinth
actions_dir = %(file_root)s/actions
doc_dir = %(file_root)s/doc
custom_static_dir = %(file_root)s/data/var/www/plinth/custom/static
store_file = %(data_dir)s/plinth.sqlite3

View File

@ -105,7 +105,6 @@ def compare_configurations(parser):
assert parser.get('Path', 'custom_static_dir') == cfg.custom_static_dir
assert parser.get('Path', 'data_dir') == cfg.data_dir
assert parser.get('Path', 'store_file') == cfg.store_file
assert parser.get('Path', 'actions_dir') == cfg.actions_dir
assert parser.get('Path', 'doc_dir') == cfg.doc_dir
assert parser.get('Network', 'host') == cfg.host