From c4595fddca5a9a5515266d3b1ed4bf46da806ec4 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Thu, 24 Nov 2022 19:08:30 +0100 Subject: [PATCH] Change perms first --- webmails/start.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/webmails/start.py b/webmails/start.py index bd395e5d..f6dd4d56 100755 --- a/webmails/start.py +++ b/webmails/start.py @@ -78,6 +78,18 @@ conf.jinja("/conf/config.inc.php", context, "/var/www/roundcube/config/config.in # create dirs os.system("mkdir -p /data/gpg") +base = "/data/_data_/_default_/" +shutil.rmtree(base + "domains/", ignore_errors=True) +os.makedirs(base + "domains", exist_ok=True) +os.makedirs(base + "configs", exist_ok=True) + +conf.jinja("/defaults/default.json", context, "/data/_data_/_default_/domains/default.json") +conf.jinja("/defaults/application.ini", context, "/data/_data_/_default_/configs/application.ini") +conf.jinja("/defaults/php.ini", context, "/etc/php81/php.ini") + +# setup permissions +os.system("chown -R mailu:mailu /data") + def demote(user_uid, user_gid): def result(): os.setgid(user_gid) @@ -110,18 +122,6 @@ else: except subprocess.CalledProcessError as exc: exit(5) -base = "/data/_data_/_default_/" -shutil.rmtree(base + "domains/", ignore_errors=True) -os.makedirs(base + "domains", exist_ok=True) -os.makedirs(base + "configs", exist_ok=True) - -conf.jinja("/defaults/default.json", context, "/data/_data_/_default_/domains/default.json") -conf.jinja("/defaults/application.ini", context, "/data/_data_/_default_/configs/application.ini") -conf.jinja("/defaults/php.ini", context, "/etc/php81/php.ini") - -# setup permissions -os.system("chown -R mailu:mailu /data") - # Configure nginx conf.jinja("/conf/nginx-webmail.conf", context, "/etc/nginx/http.d/webmail.conf") if os.path.exists("/var/run/nginx.pid"):