diff --git a/init-server.py b/init-server.py index 6ec2ee0..6d43924 100755 --- a/init-server.py +++ b/init-server.py @@ -34,7 +34,8 @@ def prepare_shared(c): set_cpu_governor(c) 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) @@ -93,14 +94,14 @@ def prepare_tile_gen(c): 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') def prepare_http_host(c): - # nginx(c) - # certbot(c) - # c1000k(c) + nginx(c) + certbot(c) + c1000k(c) prepare_venv(c) diff --git a/scripts/http_host/downloader.py b/scripts/http_host/downloader.py index 6fb6d19..eaec808 100755 --- a/scripts/http_host/downloader.py +++ b/scripts/http_host/downloader.py @@ -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): 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' if btrfs_file.exists(): 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) temp_dir.mkdir(parents=True) - gzip_file = temp_dir / 'tiles.btrfs.gz' - url = f'https://{area}.openfreemap.com/{version}/tiles.btrfs.gz' print(url) @@ -71,17 +69,19 @@ def download(area: str, version: str, runs_dir: Path): '--split=8', '--max-connection-per-server=8', '--file-allocation=none', - '-o', - gzip_file, + '--dir', + temp_dir, url, ], check=True, ) - subprocess.run(['unpigz', gzip_file]) + subprocess.run(['unpigz', temp_dir / 'tiles.btrfs.gz']) 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) shutil.rmtree(temp_dir) diff --git a/ssh_lib/pkg_base.py b/ssh_lib/pkg_base.py index 4a5a9cb..ecb5187 100644 --- a/ssh_lib/pkg_base.py +++ b/ssh_lib/pkg_base.py @@ -14,6 +14,7 @@ def pkg_base(c): 'rsync', 'btrfs-progs', 'pigz', + 'aria2' # 'gnupg2', 'gnupg-agent',