diff --git a/templates/nginx/cloudflare.conf b/config/nginx/cloudflare.conf similarity index 100% rename from templates/nginx/cloudflare.conf rename to config/nginx/cloudflare.conf diff --git a/templates/nginx/default_disable.conf b/config/nginx/default_disable.conf similarity index 100% rename from templates/nginx/default_disable.conf rename to config/nginx/default_disable.conf diff --git a/templates/nginx/nginx.conf b/config/nginx/nginx.conf similarity index 100% rename from templates/nginx/nginx.conf rename to config/nginx/nginx.conf diff --git a/templates/sysctl/60-optim.conf b/config/sysctl/60-optim.conf similarity index 100% rename from templates/sysctl/60-optim.conf rename to config/sysctl/60-optim.conf diff --git a/init-server.py b/init-server.py index 18d95f7..2f3b72d 100755 --- a/init-server.py +++ b/init-server.py @@ -4,7 +4,7 @@ import click from dotenv import dotenv_values from fabric import Config, Connection -from ssh_lib.config import templates +from ssh_lib.config import config from ssh_lib.kernel import set_cpu_governor, setup_kernel_settings from ssh_lib.nginx import certbot, nginx from ssh_lib.pkg_base import pkg_base, pkg_clean, pkg_upgrade @@ -28,7 +28,7 @@ def prepare_tile_creator(c): install_planetiler(c) put( c, - templates / 'planetiler' / 'run_planet.sh', + config / 'planetiler' / 'run_planet.sh', PLANETILER_DIR, permissions='755', owner='ofm', diff --git a/scripts/tile_creator/run_monaco.sh b/scripts/tile_creator/run_monaco.sh new file mode 100644 index 0000000..c47d77e --- /dev/null +++ b/scripts/tile_creator/run_monaco.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +DATE=$(date +"%Y%m%d_%H%M%S") + +RUN_FOLDER="/data/planetiler/runs/monaco_$DATE" + +mkdir -p "$RUN_FOLDER" +cd "$RUN_FOLDER" || exit + + +# the Xmx value below the most important parameter here +# setting is less then 25g means there is too little memory +# setting it to too much means there is too much memory used + +java -Xmx30g \ + -jar /data/planetiler/bin/planetiler.jar \ + `# Download the latest planet.osm.pbf from s3://osm-pds bucket` \ + --area=monaco --download \ + `# Accelerate the download by fetching the 10 1GB chunks at a time in parallel` \ + --download-threads=10 --download-chunk-size-mb=1000 \ + `# Also download name translations from wikidata` \ + --fetch-wikidata \ + --output=output.mbtiles \ + `# Store temporary node locations at fixed positions in a memory-mapped file` \ + --nodemap-type=array --storage=mmap \ + --force \ + > "output_$DATE.log" 2> "err_$DATE.log" + + + diff --git a/templates/planetiler/run_planet.sh b/scripts/tile_creator/run_planet.sh similarity index 94% rename from templates/planetiler/run_planet.sh rename to scripts/tile_creator/run_planet.sh index 5d5f574..3766d34 100644 --- a/templates/planetiler/run_planet.sh +++ b/scripts/tile_creator/run_planet.sh @@ -2,7 +2,7 @@ DATE=$(date +"%Y%m%d_%H%M%S") -RUN_FOLDER="/data/planetiler/runs/$DATE" +RUN_FOLDER="/data/planetiler/runs/planet_$DATE" mkdir -p "$RUN_FOLDER" cd "$RUN_FOLDER" || exit @@ -25,3 +25,6 @@ java -Xmx30g \ --nodemap-type=array --storage=mmap \ --force \ > "output_$DATE.log" 2> "err_$DATE.log" + + + diff --git a/ssh_lib/config.py b/ssh_lib/config.py index bf52735..72432d7 100644 --- a/ssh_lib/config.py +++ b/ssh_lib/config.py @@ -2,4 +2,4 @@ from pathlib import Path base = Path(__file__).parent.parent -templates = base / 'templates' +config = base / 'config' diff --git a/ssh_lib/kernel.py b/ssh_lib/kernel.py index 6d592fe..82d0402 100644 --- a/ssh_lib/kernel.py +++ b/ssh_lib/kernel.py @@ -1,9 +1,9 @@ -from ssh_lib.config import templates +from ssh_lib.config import config from ssh_lib.utils import apt_get_install, apt_get_purge, put, put_str def setup_kernel_settings(c): - put(c, f'{templates}/sysctl/60-optim.conf', '/etc/sysctl.d/') + put(c, f'{config}/sysctl/60-optim.conf', '/etc/sysctl.d/') def set_cpu_governor(c): diff --git a/ssh_lib/nginx.py b/ssh_lib/nginx.py index 8cbcd55..febb22f 100644 --- a/ssh_lib/nginx.py +++ b/ssh_lib/nginx.py @@ -1,4 +1,4 @@ -from ssh_lib.config import templates +from ssh_lib.config import config from ssh_lib.utils import ( apt_get_install, apt_get_purge, @@ -43,9 +43,9 @@ def nginx(c): '-subj "/C=US/ST=Dummy/L=Dummy/O=Dummy/CN=example.com"' ) - put(c, f'{templates}/nginx/nginx.conf', '/etc/nginx/') - put(c, f'{templates}/nginx/default_disable.conf', '/data/nginx/sites') - put(c, f'{templates}/nginx/cloudflare.conf', '/data/nginx/config') + put(c, f'{config}/nginx/nginx.conf', '/etc/nginx/') + put(c, f'{config}/nginx/default_disable.conf', '/data/nginx/sites') + put(c, f'{config}/nginx/cloudflare.conf', '/data/nginx/config') c.sudo('service nginx restart')