Store snapshots in their own path

contrib/docker/quickstart/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - ${HOST_PORT:-5000}:5000
     volumes:
       - ./geoprox.toml:/var/lib/geoprox/geoprox.toml:ro
-      - ./snapshots/snapshot.bin:/var/lib/geoprox/snapshot.bin:z
+      - ./snapshots:/var/lib/geoprox/snapshots:z
 
   # Here is an example to generate just the OpenAPI spec
   geoprox-spec:

contrib/docker/quickstart/geoprox.toml

@@ -21,6 +21,6 @@ default_sorted = false
 # Toggle snapshot usage
 disabled = false
 # Directory where snapshots will be stored
-path = '/var/lib/geoprox'
+path = '/var/lib/geoprox/snapshots'
 # How often snapshots will be taken
 every = '30s'

geoprox-server/src/config.rs

@@ -13,18 +13,21 @@ pub struct SnapshotConfig {
     /// Toggles snapshot usage
     #[serde(default)]
     pub disabled: bool,
-    /// Directory where snapshots will be stored and read from (default /var/lib/geoprox)
+    /// Directory where snapshots will be stored and read from (default /var/lib/geoprox/snapshots)
     pub path: Option<PathBuf>,
     /// Determines how often snapshots will be taken (default 60s)
     pub every: Option<DurationString>,
 }
 
 impl SnapshotConfig {
     pub const SNAPSHOT_FILENAME: &'static str = "snapshot.bin";
+    fn default_path() -> PathBuf {
+        PathBuf::from(DEFAULT_CONFIG_PATH).join("snapshots")
+    }
     pub fn bin_path(&self) -> PathBuf {
         self.path
             .clone()
-            .unwrap_or(PathBuf::from(DEFAULT_CONFIG_PATH))
+            .unwrap_or(Self::default_path())
             .join(Self::SNAPSHOT_FILENAME)
     }
 }
@@ -33,7 +36,7 @@ impl Default for SnapshotConfig {
     fn default() -> Self {
         Self {
             disabled: false,
-            path: Some(PathBuf::from(DEFAULT_CONFIG_PATH)),
+            path: Some(Self::default_path()),
             every: Some(DurationString::default()),
         }
     }

geoprox/README.md

@@ -95,7 +95,7 @@ default_sorted = false
 # Toggle snapshot usage
 disabled = false
 # Directory where snapshots will be stored
-path = '/var/lib/geoprox'
+path = '/var/lib/geoprox/snapshots'
 # How often snapshots will be taken
 every = '30s'
 ```