Move DB file location (fix #16)

Author: tananaev

README.md

@@ -197,13 +197,13 @@ cargo build --release --manifest-path server/Cargo.toml
 
 ```bash
 # Create index from PBF file
-./build/build-index output-dir input.osm.pbf [input2.osm.pbf ...]
+./build/build-index data-dir/index input.osm.pbf [input2.osm.pbf ...]
 
 # Start the server
-./server/target/release/query-server output-dir [bind-address]
+./server/target/release/query-server data-dir [bind-address]
 
 # Start with automatic HTTPS
-./server/target/release/query-server output-dir --domain geocoder.example.com
+./server/target/release/query-server data-dir --domain geocoder.example.com
 ```
 
 ## Environment Variables (Docker)

entrypoint.sh

@@ -39,7 +39,11 @@ build_index() {
 }
 
 serve() {
-    args="$DATA_DIR/index"
+    if [ ! -f "$DATA_DIR/geocoder.json" ] && [ -f "$DATA_DIR/index/geocoder.json" ]; then
+        echo "Migrating geocoder.json out of index folder..."
+        mv "$DATA_DIR/index/geocoder.json" "$DATA_DIR/geocoder.json"
+    fi
+    args="$DATA_DIR"
     if [ -n "$DOMAIN" ]; then
         args="$args --domain $DOMAIN"
         if [ -n "$CACHE_DIR" ]; then

server/src/main.rs

@@ -934,8 +934,9 @@ async fn main() {
     let db_path = format!("{}/geocoder.json", data_dir);
     let db = auth::Db::load(&db_path);
 
-    eprintln!("Loading index from {}...", data_dir);
-    let index = match Index::load(data_dir, street_cell_level, admin_cell_level) {
+    let index_dir = format!("{}/index", data_dir);
+    eprintln!("Loading index from {}...", index_dir);
+    let index = match Index::load(&index_dir, street_cell_level, admin_cell_level) {
         Ok(idx) => Arc::new(idx),
         Err(e) => {
             eprintln!("Error: {}", e);