Skip to content

dev2-edge: directories 0755 and umask 022 (dev2 root umask is 027) #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ralyodio merged 1 commit into from
Oct 19, 2026
Merged

dev2-edge: directories 0755 and umask 022 (dev2 root umask is 027) #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion dev2/edge/edge-box
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ def run(cmd, check=True, capture=False, **kw):


def put(src, dst, mode=0o644):
os.makedirs(os.path.dirname(dst), exist_ok=True)
d = os.path.dirname(dst)
if not os.path.isdir(d):
os.makedirs(d, 0o755, exist_ok=True)
os.chmod(d, 0o755)
tmp = dst + ".edge-tmp"
shutil.copyfile(src, tmp)
os.chmod(tmp, mode)
Expand Down Expand Up @@ -189,7 +192,10 @@ def install_caddy(bundle, spec):
os.makedirs(d, exist_ok=True)
shutil.chown(d, "caddy", "caddy")
os.chmod(d, 0o750)
# dev2's root umask is 027: a directory made here would be 0750 root:root and the
# caddy user could not read its own Caddyfile (the first production apply, 2026-10-19).
os.makedirs("/etc/caddy", exist_ok=True)
os.chmod("/etc/caddy", 0o755)


def install_files(bundle, which):
Expand Down Expand Up @@ -419,6 +425,9 @@ def status():


def main(argv):
# Every mode this script sets is explicit, but a tool it runs (useradd, tar, apt)
# should not inherit dev2's root umask of 027 either.
os.umask(0o022)
if not argv:
print(__doc__)
return 2
Expand Down
Loading