Commit 8b20da57 authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

But Fix: PyInfra, retaining correct ownership

parent 46c9d1ff

deploy/pyinfra/lib/operations/meep.py

+0 −7
Original line number Diff line number Diff line
@@ -67,13 +67,6 @@ def install(mec_sandbox_dir, target_home, node_version): 
    prefix = _build_env_prefix(target_home, node_version)

    yield StringCommand(f"{prefix} cd {mec_sandbox_dir}/go-apps/meepctl && bash install.sh")



    # Fix ownership since Pyinfra runs this with sudo and vendoring creates root-owned files

    target_user = target_home.split('/')[-1] # Extracts 'user' from /home/<user>

    yield StringCommand(f"chown -R {target_user}:{target_user} {mec_sandbox_dir}/go-apps/meepctl")

    yield StringCommand(f"chown -R {target_user}:{target_user} {target_home}/gocode || true")

    yield StringCommand(f"chown -R {target_user}:{target_user} {target_home}/.cache || true")

    yield StringCommand(f"chown -R {target_user}:{target_user} {mec_sandbox_dir}/bin || true")



@operation()

def configure(ip, gitdir, target_home, node_version):

    """

deploy/pyinfra/tasks/apps/mec_sandbox.py

+7 −8
Original line number Diff line number Diff line
@@ -93,15 +93,14 @@ meep.install( 
    name="Install meepctl",

    mec_sandbox_dir=mec_sandbox_dir,

    target_home=target_home,

    node_version=node_version,

    _sudo=True

    node_version=node_version

)



meep.configure_sudoers(

    name="Configure sudoers NOPASSWD rules for meepctl certificate operations",

    target_user=target_user,

    _sudo=True,

)

# meep.configure_sudoers(

#     name="Configure sudoers NOPASSWD rules for meepctl certificate operations",

#     target_user=target_user,

#     _sudo=True,

# )



meep.configure(

    name="Configure meepctl ip and gitdir",
@@ -139,7 +138,7 @@ meep.build_all( 
    target_home=target_home,

    node_version=node_version,

    nolint=True,

    build_cache=True,

    build_cache=False,

)



meep.dockerize_all(