diff --git a/data/etc/plinth/plinth.config b/data/etc/plinth/plinth.config index 3a87150e3..cf89d43c9 100644 --- a/data/etc/plinth/plinth.config +++ b/data/etc/plinth/plinth.config @@ -14,7 +14,6 @@ doc_dir = /usr/share/doc/plinth # file locations store_file = %(data_dir)s/store.sqlite3 -user_db = %(data_dir)s/users.sqlite3 status_log_file = %(log_dir)s/status.log access_log_file = %(log_dir)s/access.log pidfile = %(pid_dir)s/plinth.pid diff --git a/plinth.config b/plinth.config index e13312dad..193d18c72 100644 --- a/plinth.config +++ b/plinth.config @@ -14,7 +14,6 @@ doc_dir = %(file_root)s/doc # file locations store_file = %(data_dir)s/store.sqlite3 -user_db = %(data_dir)s/users.sqlite3 status_log_file = %(log_dir)s/status.log access_log_file = %(log_dir)s/access.log pidfile = %(pid_dir)s/plinth.pid diff --git a/plinth/cfg.py b/plinth/cfg.py index 595841fee..9e394f591 100644 --- a/plinth/cfg.py +++ b/plinth/cfg.py @@ -10,7 +10,6 @@ root = None file_root = None data_dir = None store_file = None -user_db = None actions_dir = None doc_dir = None status_log_file = None @@ -50,7 +49,6 @@ def read(): ('Path', 'file_root'), ('Path', 'data_dir'), ('Path', 'store_file'), - ('Path', 'user_db'), ('Path', 'actions_dir'), ('Path', 'doc_dir'), ('Path', 'status_log_file'), @@ -74,7 +72,3 @@ def read(): global store_file # pylint: disable-msg=W0603 if store_file.endswith(".sqlite3"): store_file = os.path.splitext(store_file)[0] - - global user_db # pylint: disable-msg=W0603 - if user_db.endswith(".sqlite3"): - user_db = os.path.splitext(user_db)[0]