sysadmin/openfreemap
1
0
Fork 0
mirror of https://github.com/hyperknot/openfreemap.git synced 2026-05-21 14:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename to user

Browse Source
This commit is contained in:
Zsolt Ero
2024-02-23 01:35:19 +01:00
parent b11342f929
commit ba8f3d93ad
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
init-server.py
View File

@@ -37,7 +37,7 @@ def prepare_venv(c):
SCRIPTS_DIR / 'prepare-virtualenv.sh', SCRIPTS_DIR / 'prepare-virtualenv.sh',
OFM_DIR, OFM_DIR,
permissions='755', permissions='755',
owner='ofm', user='ofm',
) )
sudo_cmd(c, f'cd {OFM_DIR} && source prepare-virtualenv.sh') sudo_cmd(c, f'cd {OFM_DIR} && source prepare-virtualenv.sh')
@@ -80,7 +80,7 @@ def prepare_tile_gen(c):
CONFIG_DIR / 'rclone.conf', CONFIG_DIR / 'rclone.conf',
f'{REMOTE_CONFIG}/rclone.conf', f'{REMOTE_CONFIG}/rclone.conf',
permissions='600', permissions='600',
owner='ofm', user='ofm',
) )
c.sudo('chown ofm:ofm /data/ofm/tile_gen') c.sudo('chown ofm:ofm /data/ofm/tile_gen')

22
ssh_lib/utils.py
View File

@@ -5,7 +5,7 @@ from pathlib import Path
def put( def put(
c, local_path, remote_path, permissions=None, owner='root', group=None, create_parent_dir=False c, local_path, remote_path, permissions=None, user='root', group=None, create_parent_dir=False
): ):
tmp_path = f'/tmp/fabtmp_{random_string(8)}' tmp_path = f'/tmp/fabtmp_{random_string(8)}'
c.put(local_path, tmp_path) c.put(local_path, tmp_path)
@@ -13,7 +13,7 @@ def put(
if create_parent_dir: if create_parent_dir:
dirname = os.path.dirname(remote_path) dirname = os.path.dirname(remote_path)
c.sudo(f'mkdir -p {dirname}') c.sudo(f'mkdir -p {dirname}')
set_permission(c, dirname, owner=owner, group=group) set_permission(c, dirname, user=user, group=group)
if is_dir(c, remote_path): if is_dir(c, remote_path):
if not remote_path.endswith('/'): if not remote_path.endswith('/'):
@@ -25,7 +25,7 @@ def put(
c.sudo(f"mv '{tmp_path}' '{remote_path}'") c.sudo(f"mv '{tmp_path}' '{remote_path}'")
c.sudo(f"rm -rf '{tmp_path}'") c.sudo(f"rm -rf '{tmp_path}'")
set_permission(c, remote_path, permissions=permissions, owner=owner, group=group) set_permission(c, remote_path, permissions=permissions, user=user, group=group)
def put_dir( def put_dir(
@@ -34,7 +34,7 @@ def put_dir(
remote_dir, remote_dir,
dir_permissions=None, dir_permissions=None,
file_permissions=None, file_permissions=None,
owner='root', user='root',
group=None, group=None,
exclude_set=None, exclude_set=None,
): ):
@@ -49,11 +49,11 @@ def put_dir(
files = [f for f in files if f.name not in exclude_set] files = [f for f in files if f.name not in exclude_set]
c.sudo(f'mkdir -p "{remote_dir}"') c.sudo(f'mkdir -p "{remote_dir}"')
set_permission(c, remote_dir, permissions=dir_permissions, owner=owner, group=group) set_permission(c, remote_dir, permissions=dir_permissions, user=user, group=group)
for file in files: for file in files:
print(f'uploading {remote_dir}/{file.name}') print(f'uploading {remote_dir}/{file.name}')
put(c, file, f'{remote_dir}/{file.name}', file_permissions, owner, group) put(c, file, f'{remote_dir}/{file.name}', file_permissions, user, group)
def put_str(c, remote_path, str_): def put_str(c, remote_path, str_):
@@ -77,11 +77,11 @@ def sudo_cmd(c, cmd, *, user=None):
c.sudo(f'bash -c "{cmd}"', user=user) c.sudo(f'bash -c "{cmd}"', user=user)
def set_permission(c, path, *, permissions=None, owner=None, group=None): def set_permission(c, path, *, permissions=None, user=None, group=None):
if owner: if user:
if not group: if not group:
group = owner group = user
c.sudo(f"chown {owner}:{group} '{path}'") c.sudo(f"chown {user}:{group} '{path}'")
if permissions: if permissions:
c.sudo(f"chmod {permissions} '{path}'") c.sudo(f"chmod {permissions} '{path}'")
@@ -157,5 +157,5 @@ def enable_sudo(c, username, nopasswd=False):
c.sudo(f'usermod -aG sudo {username}') c.sudo(f'usermod -aG sudo {username}')
if nopasswd: if nopasswd:
put_str(c, '/etc/sudoers.d/tmp.', f'{username} ALL=(ALL) NOPASSWD:ALL') put_str(c, '/etc/sudoers.d/tmp.', f'{username} ALL=(ALL) NOPASSWD:ALL')
set_permission(c, '/etc/sudoers.d/tmp.', permissions='440', owner='root') set_permission(c, '/etc/sudoers.d/tmp.', permissions='440', user='root')
c.sudo(f'mv /etc/sudoers.d/tmp. /etc/sudoers.d/{username}') c.sudo(f'mv /etc/sudoers.d/tmp. /etc/sudoers.d/{username}')