diff --git a/bench/utils.py b/bench/utils.py index 2d60e9fb..317ff794 100755 --- a/bench/utils.py +++ b/bench/utils.py @@ -1,4 +1,4 @@ -import os, sys, shutil, subprocess, logging, itertools, requests, json, platform, select, pwd, grp, multiprocessing, hashlib +import os, sys, shutil, subprocess, logging, itertools, requests, json, platform, select, pwd, grp, multiprocessing, hashlib, glob from distutils.spawn import find_executable import bench import semantic_version @@ -556,16 +556,6 @@ def drop_privileges(uid_name='nobody', gid_name='nogroup'): def fix_prod_setup_perms(bench_path='.', frappe_user=None): from .config.common_site_config import get_config - files = [ - "logs/web.error.log", - "logs/web.log", - "logs/workerbeat.error.log", - "logs/workerbeat.log", - "logs/worker.error.log", - "logs/worker.log", - "config/nginx.conf", - "config/supervisor.conf", - ] if not frappe_user: frappe_user = get_config(bench_path).get('frappe_user') @@ -574,8 +564,9 @@ def fix_prod_setup_perms(bench_path='.', frappe_user=None): print("frappe user not set") sys.exit(1) - for path in files: - if os.path.exists(path): + globs = ["logs/*", "config/*"] + for glob_name in globs: + for path in glob.glob(glob_name): uid = pwd.getpwnam(frappe_user).pw_uid gid = grp.getgrnam(frappe_user).gr_gid os.chown(path, uid, gid)