diff --git a/vmupdate/agent/entrypoint.py b/vmupdate/agent/entrypoint.py index 3f5a0df5..79e7a409 100755 --- a/vmupdate/agent/entrypoint.py +++ b/vmupdate/agent/entrypoint.py @@ -6,7 +6,7 @@ from source import plugins from source.args import AgentArgs from source.utils import get_os_data -from source.log_congfig import init_logs +from source.log_config import init_logs from source.common.exit_codes import EXIT diff --git a/vmupdate/agent/source/log_congfig.py b/vmupdate/agent/source/log_config.py similarity index 90% rename from vmupdate/agent/source/log_congfig.py rename to vmupdate/agent/source/log_config.py index b70ba4b7..9a4c2be4 100644 --- a/vmupdate/agent/source/log_congfig.py +++ b/vmupdate/agent/source/log_config.py @@ -21,6 +21,7 @@ import os import logging +import grp from pathlib import Path LOGPATH = '/var/log/qubes/qubes-update' @@ -63,4 +64,12 @@ def init_logs( log_level = "DEBUG" log.setLevel(log_level) + try: + gid = grp.getgrnam("qubes").gr_gid + os.chown(log_path, -1, gid) + os.chmod(log_path, 0o664) + except (PermissionError, KeyError): + # do it on the best effort basis + pass + return log, log_handler, log_level, log_path, log_formatter diff --git a/vmupdate/qube_connection.py b/vmupdate/qube_connection.py index 01279cca..97201309 100644 --- a/vmupdate/qube_connection.py +++ b/vmupdate/qube_connection.py @@ -29,7 +29,7 @@ import qubesadmin from vmupdate.agent.source.args import AgentArgs -from vmupdate.agent.source.log_congfig import LOGPATH, LOG_FILE +from vmupdate.agent.source.log_config import LOGPATH, LOG_FILE from vmupdate.agent.source.status import StatusInfo, FinalStatus from vmupdate.agent.source.common.process_result import ProcessResult diff --git a/vmupdate/update_manager.py b/vmupdate/update_manager.py index e4977bc4..0e3aea0c 100644 --- a/vmupdate/update_manager.py +++ b/vmupdate/update_manager.py @@ -34,7 +34,7 @@ from .agent.source.status import StatusInfo, FinalStatus, Status from .qube_connection import QubeConnection -from vmupdate.agent.source.log_congfig import init_logs +from vmupdate.agent.source.log_config import init_logs from vmupdate.agent.source.common.process_result import ProcessResult from vmupdate.agent.source.common.exit_codes import EXIT