diff --git a/plinth/cfg.py b/plinth/cfg.py index 4accf0845..b53d2df71 100644 --- a/plinth/cfg.py +++ b/plinth/cfg.py @@ -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'), diff --git a/plinth/conftest.py b/plinth/conftest.py index e3b77b8f3..a4ce1bbec 100644 --- a/plinth/conftest.py +++ b/plinth/conftest.py @@ -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) diff --git a/plinth/develop.config b/plinth/develop.config index b3edf47d9..f8b70135c 100644 --- a/plinth/develop.config +++ b/plinth/develop.config @@ -1,4 +1,3 @@ [Path] file_root = %(parent_parent_dir)s -actions_dir = %(file_root)s/actions doc_dir = %(file_root)s/doc diff --git a/plinth/tests/data/configs/freedombox.config b/plinth/tests/data/configs/freedombox.config index 30cb3d2ee..30cfb0aad 100644 --- a/plinth/tests/data/configs/freedombox.config +++ b/plinth/tests/data/configs/freedombox.config @@ -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 diff --git a/plinth/tests/test_cfg.py b/plinth/tests/test_cfg.py index feaf7b75a..9dddf5c56 100644 --- a/plinth/tests/test_cfg.py +++ b/plinth/tests/test_cfg.py @@ -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