From 3f55c69e0283f7275b23e2510a1b074d08183da0 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Wed, 27 Dec 2023 02:01:24 +0100 Subject: [PATCH] work --- config/rclone.conf.sample | 7 + docs/fs_stats/btrfs_after_delete.txt | 30 +- docs/fs_stats/btrfs_before_delete.txt | 30 +- docs/fs_stats/dedupl_fixed.log | 468 +++++++++--------- docs/fs_stats/planet_version | 1 + init-server.py | 15 +- scripts/tile_gen/upload_cloudflare.sh | 1 + {config => ssh_lib/assets}/kernel/60-ofm.conf | 0 .../assets}/kernel/limits-ofm.conf | 0 .../assets}/nginx/cloudflare.conf | 0 .../assets}/nginx/default_disable.conf | 0 {config => ssh_lib/assets}/nginx/nginx.conf | 0 ssh_lib/benchmark.py | 6 +- ssh_lib/config.py | 5 +- ssh_lib/kernel.py | 6 +- ssh_lib/nginx.py | 8 +- 16 files changed, 294 insertions(+), 283 deletions(-) create mode 100644 config/rclone.conf.sample create mode 100644 docs/fs_stats/planet_version rename {config => ssh_lib/assets}/kernel/60-ofm.conf (100%) rename {config => ssh_lib/assets}/kernel/limits-ofm.conf (100%) rename {config => ssh_lib/assets}/nginx/cloudflare.conf (100%) rename {config => ssh_lib/assets}/nginx/default_disable.conf (100%) rename {config => ssh_lib/assets}/nginx/nginx.conf (100%) diff --git a/config/rclone.conf.sample b/config/rclone.conf.sample new file mode 100644 index 0000000..188c608 --- /dev/null +++ b/config/rclone.conf.sample @@ -0,0 +1,7 @@ +[cf] +type = s3 +provider = Cloudflare +access_key_id = xxx +secret_access_key = xxx +endpoint = https://xxx.r2.cloudflarestorage.com + diff --git a/docs/fs_stats/btrfs_after_delete.txt b/docs/fs_stats/btrfs_after_delete.txt index d80fb09..4cf5ffa 100644 --- a/docs/fs_stats/btrfs_after_delete.txt +++ b/docs/fs_stats/btrfs_after_delete.txt @@ -1,19 +1,19 @@ df -h Filesystem Size Used Avail Use% Mounted on -/dev/loop4 200G 130G 70G 65% /data/ofm/runs/planet_20231208_091355/mnt_rw2 +/dev/loop1 200G 130G 70G 66% /data/ofm/tile_gen/runs/planet/20231221_134737_pt/mnt_rw2 btrfs filesystem df -Data, single: total=48.01GiB, used=47.32GiB +Data, single: total=48.01GiB, used=47.54GiB System, single: total=4.00MiB, used=16.00KiB -Metadata, single: total=83.01GiB, used=81.27GiB +Metadata, single: total=83.01GiB, used=81.42GiB GlobalReserve, single: total=512.00MiB, used=0.00B btrfs filesystem show -Label: none uuid: d95b460e-4005-4f1f-ba28-bf4a82ecdbd5 - Total devices 1 FS bytes used 128.59GiB - devid 1 size 200.00GiB used 131.02GiB path /dev/loop4 +Label: none uuid: b9e8ae3a-aedb-4221-ab08-e1ad6095f188 + Total devices 1 FS bytes used 128.96GiB + devid 1 size 200.00GiB used 131.02GiB path /dev/loop1 @@ -23,22 +23,22 @@ Overall: Device allocated: 131.02GiB Device unallocated: 68.98GiB Device missing: 0.00B - Used: 128.59GiB - Free (estimated): 69.67GiB (min: 69.67GiB) - Free (statfs, df): 69.67GiB + Used: 128.96GiB + Free (estimated): 69.45GiB (min: 69.45GiB) + Free (statfs, df): 69.44GiB Data ratio: 1.00 Metadata ratio: 1.00 Global reserve: 512.00MiB (used: 0.00B) Multiple profiles: no -Data,single: Size:48.01GiB, Used:47.32GiB (98.57%) - /dev/loop4 48.01GiB +Data,single: Size:48.01GiB, Used:47.54GiB (99.03%) + /dev/loop1 48.01GiB -Metadata,single: Size:83.01GiB, Used:81.27GiB (97.91%) - /dev/loop4 83.01GiB +Metadata,single: Size:83.01GiB, Used:81.42GiB (98.09%) + /dev/loop1 83.01GiB System,single: Size:4.00MiB, Used:16.00KiB (0.39%) - /dev/loop4 4.00MiB + /dev/loop1 4.00MiB Unallocated: - /dev/loop4 68.98GiB + /dev/loop1 68.98GiB diff --git a/docs/fs_stats/btrfs_before_delete.txt b/docs/fs_stats/btrfs_before_delete.txt index 9f20804..4d8318b 100644 --- a/docs/fs_stats/btrfs_before_delete.txt +++ b/docs/fs_stats/btrfs_before_delete.txt @@ -1,19 +1,19 @@ df -h Filesystem Size Used Avail Use% Mounted on -/dev/loop3 200G 139G 61G 70% /data/ofm/runs/planet_20231208_091355/mnt_rw +/dev/loop0 200G 139G 61G 70% /data/ofm/tile_gen/runs/planet/20231221_134737_pt/mnt_rw btrfs filesystem df -Data, single: total=48.01GiB, used=47.45GiB +Data, single: total=48.01GiB, used=47.59GiB System, single: total=4.00MiB, used=16.00KiB -Metadata, single: total=92.01GiB, used=90.36GiB +Metadata, single: total=92.01GiB, used=90.52GiB GlobalReserve, single: total=512.00MiB, used=0.00B btrfs filesystem show -Label: none uuid: 1ca91839-f506-452e-bb09-4f13f58d5944 - Total devices 1 FS bytes used 137.81GiB - devid 1 size 200.00GiB used 140.02GiB path /dev/loop3 +Label: none uuid: 9c5cd306-96c8-4ee5-bfbb-b8216698f955 + Total devices 1 FS bytes used 138.11GiB + devid 1 size 200.00GiB used 140.02GiB path /dev/loop0 @@ -23,22 +23,22 @@ Overall: Device allocated: 140.02GiB Device unallocated: 59.98GiB Device missing: 0.00B - Used: 137.81GiB - Free (estimated): 60.54GiB (min: 60.54GiB) - Free (statfs, df): 60.54GiB + Used: 138.11GiB + Free (estimated): 60.40GiB (min: 60.40GiB) + Free (statfs, df): 60.40GiB Data ratio: 1.00 Metadata ratio: 1.00 Global reserve: 512.00MiB (used: 0.00B) Multiple profiles: no -Data,single: Size:48.01GiB, Used:47.45GiB (98.83%) - /dev/loop3 48.01GiB +Data,single: Size:48.01GiB, Used:47.59GiB (99.12%) + /dev/loop0 48.01GiB -Metadata,single: Size:92.01GiB, Used:90.36GiB (98.21%) - /dev/loop3 92.01GiB +Metadata,single: Size:92.01GiB, Used:90.52GiB (98.38%) + /dev/loop0 92.01GiB System,single: Size:4.00MiB, Used:16.00KiB (0.39%) - /dev/loop3 4.00MiB + /dev/loop0 4.00MiB Unallocated: - /dev/loop3 59.98GiB + /dev/loop0 59.98GiB diff --git a/docs/fs_stats/dedupl_fixed.log b/docs/fs_stats/dedupl_fixed.log index f71ae8f..8147b15 100644 --- a/docs/fs_stats/dedupl_fixed.log +++ b/docs/fs_stats/dedupl_fixed.log @@ -1,234 +1,234 @@ -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-3 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-4 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-5 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-6 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-7 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-8 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-9 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-10 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-3 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-4 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-5 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-3 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-6 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-7 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-3 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-4 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-8 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-5 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-9 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-6 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-4 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-7 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-8 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-5 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-10 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-6 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-7 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-8 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-9 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-9 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-10 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-11 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-3 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-3 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-4 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-5 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-6 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-11 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-12 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-13 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-14 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-15 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-16 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-17 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-18 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-19 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-20 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-21 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-22 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-23 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-24 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-25 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-26 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-27 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-28 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-29 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-30 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-31 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-32 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-33 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-34 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-35 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-36 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-37 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-38 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/069/716.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-39 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-40 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-41 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-42 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/541.pbf-43 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/074/696.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/078/016.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/089/935.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-11 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-12 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/029/417.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-13 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/102/511.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-14 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-15 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/101/473.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-16 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/029/417.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-17 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/100/899.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-18 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-19 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-10 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-20 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-21 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-11 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-22 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/031/388.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-23 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-12 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-24 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-25 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-13 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-4 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-26 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-27 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-14 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-28 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-12 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-29 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-15 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-30 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-16 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-31 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-32 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-17 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-33 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-5 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-13 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-18 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-34 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-19 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-20 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-35 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-14 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-21 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-36 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-22 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-23 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-15 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-24 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-25 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-26 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-6 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-27 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-37 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-16 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-28 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-29 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-17 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-30 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-31 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-38 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-18 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-32 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-19 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-39 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-20 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-21 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-33 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-22 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-40 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-23 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-7 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-24 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-34 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-25 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-41 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-26 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-27 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-28 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-35 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-42 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-29 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-30 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-31 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-32 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-43 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-8 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/296.pbf-36 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-33 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-34 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-35 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-36 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-9 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-37 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-38 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-39 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/753.pbf-44 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-40 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-10 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-41 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-42 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-11 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-43 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-44 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/671.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-12 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-45 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-13 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-14 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/601.pbf-46 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-15 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/671.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/472.pbf-16 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/671.pbf-3 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/037/051.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/127/206.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/038/905.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/041/436.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/149/880.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/149/880.pbf-2 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/152/475.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/047/840.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/164/466.pbf-1 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-7 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-8 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-9 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-10 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-11 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-12 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-13 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-14 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-15 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-16 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-17 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-18 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-19 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-20 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-21 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-22 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-23 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-24 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-25 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-26 -Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/476.pbf-27 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-3 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-4 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-5 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-6 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-7 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-8 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-9 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-10 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-3 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-4 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-5 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-3 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-6 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-7 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-3 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-4 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-8 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-5 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-9 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-6 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-4 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-7 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-8 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-5 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-10 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-6 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-7 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-8 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-9 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-9 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-10 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-11 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-3 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-3 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-4 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-5 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-6 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-11 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-12 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-13 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-14 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-15 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-16 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-17 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-18 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-19 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-20 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-21 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-22 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-23 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-24 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-25 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-26 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-27 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-28 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-29 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-30 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-31 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-32 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-33 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-34 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-35 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-36 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-37 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-38 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/069/796.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-39 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-40 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-41 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-42 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/004/546.pbf-43 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/074/934.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/078/331.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/090/195.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-11 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-12 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/029/536.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-13 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/102/751.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-14 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-15 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/101/708.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-16 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/029/536.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-17 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/101/129.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-18 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-19 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-10 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-20 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-21 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-11 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-22 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/031/503.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-23 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-12 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-24 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-25 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-13 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-4 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-26 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-27 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-14 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-28 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-12 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-29 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-15 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-30 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-16 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-31 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-32 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-17 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-33 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-5 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-13 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-18 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-34 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-19 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-20 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-35 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-14 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-21 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-36 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-22 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-23 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-15 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-24 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-25 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-26 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-6 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-27 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-37 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-16 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-28 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-29 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-17 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-30 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-31 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-38 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-18 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-32 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-19 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-39 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-20 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-21 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-33 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-22 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-40 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-23 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-7 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-24 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-34 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-25 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-41 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-26 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-27 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-28 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-35 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-42 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-29 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-30 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-31 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-32 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-43 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-8 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/347.pbf-36 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-33 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-34 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-35 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-36 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-9 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-37 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-38 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-39 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/007/806.pbf-44 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-40 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-10 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-41 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-42 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-11 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-43 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-44 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/730.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-12 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-45 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-13 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-14 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/008/663.pbf-46 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-15 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/730.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/530.pbf-16 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/009/730.pbf-3 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/037/250.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/127/507.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/039/025.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/041/570.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/150/189.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/150/189.pbf-2 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/152/800.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/047/927.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/164/724.pbf-1 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-7 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-8 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-9 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-10 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-11 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-12 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-13 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-14 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-15 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-16 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-17 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-18 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-19 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-20 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-21 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-22 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-23 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-24 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-25 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-26 +Created fixed dedupl file: mnt_rw/extract/dedupl/000/015/518.pbf-27 diff --git a/docs/fs_stats/planet_version b/docs/fs_stats/planet_version new file mode 100644 index 0000000..50c6aac --- /dev/null +++ b/docs/fs_stats/planet_version @@ -0,0 +1 @@ +planetiler: 2023-12-11 diff --git a/init-server.py b/init-server.py index 6a0fd9e..4587fcd 100755 --- a/init-server.py +++ b/init-server.py @@ -6,7 +6,7 @@ from dotenv import dotenv_values from fabric import Config, Connection from ssh_lib.benchmark import benchmark, c1000k -from ssh_lib.config import config, scripts +from ssh_lib.config import assets_dir, scripts_dir 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_upgrade @@ -28,6 +28,7 @@ def prepare_shared(c): def prepare_tile_gen(c): install_planetiler(c) + # TODO rclone for file in [ 'extract_btrfs.sh', @@ -38,14 +39,14 @@ def prepare_tile_gen(c): ]: put( c, - scripts / 'tile_gen' / file, + scripts_dir / 'tile_gen' / file, TILE_GEN_BIN, permissions='755', ) put( c, - scripts / 'tile_gen' / 'extract_mbtiles' / 'extract_mbtiles.py', + scripts_dir / 'tile_gen' / 'extract_mbtiles' / 'extract_mbtiles.py', f'{TILE_GEN_BIN}/extract_mbtiles/extract_mbtiles.py', permissions='755', create_parent_dir=True, @@ -53,14 +54,14 @@ def prepare_tile_gen(c): put( c, - scripts / 'tile_gen' / 'shrink_btrfs' / 'shrink_btrfs.py', + scripts_dir / 'tile_gen' / 'shrink_btrfs' / 'shrink_btrfs.py', f'{TILE_GEN_BIN}/shrink_btrfs/shrink_btrfs.py', permissions='755', create_parent_dir=True, ) c.sudo('chown ofm:ofm /data/ofm') - c.sudo(f'chown -R ofm:ofm {TILE_GEN_BIN}') + c.sudo('chown -R ofm:ofm /data/ofm/tile_gen') sudo_cmd(c, f'cd {TILE_GEN_BIN} && source prepare-virtualenv.sh', user='ofm') @@ -75,8 +76,8 @@ def debug_tmp(c): c.sudo('rm -rf /data/ofm/logs') c.sudo('mkdir -p /data/ofm/logs') c.sudo('rm -f /data/nginx/logs/*') - put(c, f'{config}/nginx/nginx.conf', '/etc/nginx/') - put(c, f'{scripts}/http_host/nginx_site.conf', '/data/nginx/sites') + put(c, f'{assets_dir}/nginx/nginx.conf', '/etc/nginx/') + put(c, f'{scripts_dir}/http_host/nginx_site.conf', '/data/nginx/sites') c.sudo('nginx -t') c.sudo('service nginx restart') diff --git a/scripts/tile_gen/upload_cloudflare.sh b/scripts/tile_gen/upload_cloudflare.sh index 7035c16..88ffc88 100644 --- a/scripts/tile_gen/upload_cloudflare.sh +++ b/scripts/tile_gen/upload_cloudflare.sh @@ -6,6 +6,7 @@ DIR_NAME="${PWD##*/}" rm -f rclone.log rclone sync \ + --config=/data/ofm/config/rclone.conf \ --transfers=8 \ --multi-thread-streams=8 \ --fast-list \ diff --git a/config/kernel/60-ofm.conf b/ssh_lib/assets/kernel/60-ofm.conf similarity index 100% rename from config/kernel/60-ofm.conf rename to ssh_lib/assets/kernel/60-ofm.conf diff --git a/config/kernel/limits-ofm.conf b/ssh_lib/assets/kernel/limits-ofm.conf similarity index 100% rename from config/kernel/limits-ofm.conf rename to ssh_lib/assets/kernel/limits-ofm.conf diff --git a/config/nginx/cloudflare.conf b/ssh_lib/assets/nginx/cloudflare.conf similarity index 100% rename from config/nginx/cloudflare.conf rename to ssh_lib/assets/nginx/cloudflare.conf diff --git a/config/nginx/default_disable.conf b/ssh_lib/assets/nginx/default_disable.conf similarity index 100% rename from config/nginx/default_disable.conf rename to ssh_lib/assets/nginx/default_disable.conf diff --git a/config/nginx/nginx.conf b/ssh_lib/assets/nginx/nginx.conf similarity index 100% rename from config/nginx/nginx.conf rename to ssh_lib/assets/nginx/nginx.conf diff --git a/ssh_lib/benchmark.py b/ssh_lib/benchmark.py index 2bb21a3..4a572c2 100644 --- a/ssh_lib/benchmark.py +++ b/ssh_lib/benchmark.py @@ -1,5 +1,5 @@ -from ssh_lib.config import scripts -from ssh_lib.utils import apt_get_install, apt_get_update, put, put_str, sudo_cmd +from ssh_lib.config import scripts_dir +from ssh_lib.utils import apt_get_install, put def c1000k(c): @@ -17,6 +17,6 @@ def c1000k(c): def benchmark(c): apt_get_install(c, 'wrk') c.sudo('mkdir -p /data/ofm/benchmark') - put(c, f'{scripts}/benchmark/wrk_custom_list.lua', '/data/ofm/benchmark') + put(c, f'{scripts_dir}/http_host/benchmark/wrk_custom_list.lua', '/data/ofm/benchmark') # wrk -c10 -d10s -t1 -s /data/ofm/benchmark/wrk_custom_list.lua http://localhost diff --git a/ssh_lib/config.py b/ssh_lib/config.py index 4b35f25..0d60c71 100644 --- a/ssh_lib/config.py +++ b/ssh_lib/config.py @@ -2,5 +2,6 @@ from pathlib import Path base = Path(__file__).parent.parent -config = base / 'config' -scripts = base / 'scripts' +config_dir = base / 'config' +scripts_dir = base / 'scripts' +assets_dir = Path(__file__).parent / 'assets' diff --git a/ssh_lib/kernel.py b/ssh_lib/kernel.py index 882640a..9f3327e 100644 --- a/ssh_lib/kernel.py +++ b/ssh_lib/kernel.py @@ -1,10 +1,10 @@ -from ssh_lib.config import config +from ssh_lib.config import config_dir from ssh_lib.utils import apt_get_install, apt_get_purge, put, put_str def setup_kernel_settings(c): - put(c, f'{config}/kernel/60-ofm.conf', '/etc/sysctl.d/') - put(c, f'{config}/kernel/limits-ofm.conf', '/etc/security/limits.d/') + put(c, f'{config_dir}/kernel/60-ofm.conf', '/etc/sysctl.d/') + put(c, f'{config_dir}/kernel/limits-ofm.conf', '/etc/security/limits.d/') def set_cpu_governor(c): diff --git a/ssh_lib/nginx.py b/ssh_lib/nginx.py index a171656..a34c629 100644 --- a/ssh_lib/nginx.py +++ b/ssh_lib/nginx.py @@ -1,4 +1,4 @@ -from ssh_lib.config import config +from ssh_lib.config import assets_dir from ssh_lib.utils import ( apt_get_install, apt_get_purge, @@ -46,9 +46,9 @@ def nginx(c): hide=True, ) - 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') + put(c, f'{assets_dir}/nginx/nginx.conf', '/etc/nginx/') + put(c, f'{assets_dir}/nginx/default_disable.conf', '/data/nginx/sites') + put(c, f'{assets_dir}/nginx/cloudflare.conf', '/data/nginx/config') c.sudo('service nginx restart')