diff --git a/README.md b/README.md index 633b82a..bd68190 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,12 @@ See [dev setup docs](docs/dev_setup.md). ## Changelog -**v0.8** +##### v0.9 + +Updated Planetiler version to latest + + +##### v0.8 Lot of self-hosting related fixes. @@ -193,7 +198,7 @@ Generating the domain inside the style TileJSON files dynamically (using nginx s Added SELF_SIGNED_CERTS variable for cases when the certificates are self-managed or self-signed is OK. -**v0.7** +##### v0.7 MBTiles are now uploaded, next to the btrfs image files. diff --git a/init-server.py b/init-server.py index b80eaf7..3095797 100755 --- a/init-server.py +++ b/init-server.py @@ -91,13 +91,25 @@ def http_host_autoupdate(hostname, user, port, noninteractive): @cli.command() @common_options @click.option('--cron', is_flag=True, help='Enable cron task') -def tile_gen(hostname, user, port, cron, noninteractive): +@click.option('--reinstall', is_flag=True, help='Reinstall everything in /data/ofm folder') +def tile_gen( + hostname, + user, + port, + noninteractive, + # + cron, + reinstall, +): if not noninteractive and not click.confirm(f'Run script on {hostname}?'): return c = get_connection(hostname, user, port) - prepare_shared(c) + if reinstall: + c.sudo('rm -rf /data/ofm') + + # prepare_shared(c) prepare_tile_gen(c, enable_cron=cron) diff --git a/ssh_lib/planetiler.py b/ssh_lib/planetiler.py index f473530..d1c88ac 100644 --- a/ssh_lib/planetiler.py +++ b/ssh_lib/planetiler.py @@ -2,7 +2,7 @@ from ssh_lib import PLANETILER_BIN, PLANETILER_SRC from ssh_lib.utils import apt_get_install, apt_get_update, exists, sudo_cmd -PLANETILER_COMMIT = 'ee22a014022f1dcc120cba6a768567408ba74908' +PLANETILER_COMMIT = 'cc769c4f' PLANETILER_PATH = f'{PLANETILER_BIN}/planetiler.jar' @@ -17,6 +17,7 @@ def install_planetiler(c): c.sudo(f'rm -rf {PLANETILER_BIN} {PLANETILER_SRC}') c.sudo(f'mkdir -p {PLANETILER_BIN} {PLANETILER_SRC}') + c.sudo('git config --global advice.detachedHead false') c.sudo( f'git clone --recurse-submodules https://github.com/onthegomap/planetiler.git {PLANETILER_SRC}' ) diff --git a/ssh_lib/tasks.py b/ssh_lib/tasks.py index 44cdc11..c8f7048 100644 --- a/ssh_lib/tasks.py +++ b/ssh_lib/tasks.py @@ -12,7 +12,7 @@ from ssh_lib import ( dotenv_val, ) from ssh_lib.benchmark import c1000k, wrk -from ssh_lib.kernel import kernel_tweaks_ofm +from ssh_lib.kernel import kernel_limits1m, kernel_somaxconn65k from ssh_lib.nginx import certbot, nginx from ssh_lib.pkg_base import pkg_base, pkg_upgrade from ssh_lib.planetiler import install_planetiler @@ -83,7 +83,8 @@ def prepare_tile_gen(c, *, enable_cron): def prepare_http_host(c): - kernel_tweaks_ofm(c) + kernel_somaxconn65k(c) + kernel_limits1m(c) nginx(c) certbot(c)