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

downloader work

Browse Source
This commit is contained in:
Zsolt Ero
2023-12-28 20:05:53 +01:00
parent 8b33452ca3
commit f19bb8dcd9
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
init-server.py
View File

@@ -34,7 +34,8 @@ def prepare_shared(c):
set_cpu_governor(c) set_cpu_governor(c)
c.sudo(f'mkdir -p {REMOTE_CONFIG}') c.sudo(f'mkdir -p {REMOTE_CONFIG}')
c.sudo('chown ofm:ofm /data/ofm/.*') c.sudo('chown ofm:ofm /data/ofm/config')
c.sudo('chown ofm:ofm /data/ofm')
prepare_venv(c) prepare_venv(c)
@@ -93,14 +94,14 @@ def prepare_tile_gen(c):
owner='ofm', owner='ofm',
) )
c.sudo('chown ofm:ofm /data/ofm/tile_gen/.*') c.sudo('chown ofm:ofm /data/ofm/tile_gen')
c.sudo('chown ofm:ofm -R /data/ofm/tile_gen/bin') c.sudo('chown ofm:ofm -R /data/ofm/tile_gen/bin')
def prepare_http_host(c): def prepare_http_host(c):
# nginx(c) nginx(c)
# certbot(c) certbot(c)
# c1000k(c) c1000k(c)
prepare_venv(c) prepare_venv(c)

14
scripts/http_host/downloader.py
View File

@@ -50,7 +50,7 @@ def cli(area: str, version: str, list_versions: bool, runs_dir: Path):
def download(area: str, version: str, runs_dir: Path): def download(area: str, version: str, runs_dir: Path):
click.echo(f'Downloading: area: {area}, version: {version}') click.echo(f'Downloading: area: {area}, version: {version}')
version_dir = runs_dir / version version_dir = runs_dir / area / version
btrfs_file = version_dir / 'tiles.btrfs' btrfs_file = version_dir / 'tiles.btrfs'
if btrfs_file.exists(): if btrfs_file.exists():
print('File exists, skipping download') print('File exists, skipping download')
@@ -60,8 +60,6 @@ def download(area: str, version: str, runs_dir: Path):
shutil.rmtree(temp_dir, ignore_errors=True) shutil.rmtree(temp_dir, ignore_errors=True)
temp_dir.mkdir(parents=True) temp_dir.mkdir(parents=True)
gzip_file = temp_dir / 'tiles.btrfs.gz'
url = f'https://{area}.openfreemap.com/{version}/tiles.btrfs.gz' url = f'https://{area}.openfreemap.com/{version}/tiles.btrfs.gz'
print(url) print(url)
@@ -71,17 +69,19 @@ def download(area: str, version: str, runs_dir: Path):
'--split=8', '--split=8',
'--max-connection-per-server=8', '--max-connection-per-server=8',
'--file-allocation=none', '--file-allocation=none',
'-o', '--dir',
gzip_file, temp_dir,
url, url,
], ],
check=True, check=True,
) )
subprocess.run(['unpigz', gzip_file]) subprocess.run(['unpigz', temp_dir / 'tiles.btrfs.gz'])
btrfs_src = temp_dir / 'tiles.btrfs' btrfs_src = temp_dir / 'tiles.btrfs'
version_dir.mkdir() shutil.rmtree(version_dir, ignore_errors=True)
version_dir.mkdir(parents=True)
btrfs_src.rename(btrfs_file) btrfs_src.rename(btrfs_file)
shutil.rmtree(temp_dir) shutil.rmtree(temp_dir)

1
ssh_lib/pkg_base.py
View File

@@ -14,6 +14,7 @@ def pkg_base(c):
'rsync', 'rsync',
'btrfs-progs', 'btrfs-progs',
'pigz', 'pigz',
'aria2'
# #
'gnupg2', 'gnupg2',
'gnupg-agent', 'gnupg-agent',