database: keep links in their own dir, and rename "published" dir to "pub"

database/src/fs.rs

@@ -78,14 +78,15 @@ impl Filesystem {
         let keys_external_dir: PathBuf = keys_external_dir.into();
         let keys_dir_full = keys_internal_dir.join("full");
         let keys_dir_quarantined = keys_internal_dir.join("quarantined");
-        let keys_dir_published = keys_external_dir.join("published");
+        let keys_dir_published = keys_external_dir.join("pub");
         create_dir_all(&keys_dir_full)?;
         create_dir_all(&keys_dir_quarantined)?;
         create_dir_all(&keys_dir_published)?;
 
-        let links_dir_by_keyid = keys_external_dir.join("by-keyid");
-        let links_dir_by_fingerprint = keys_external_dir.join("by-fpr");
-        let links_dir_by_email = keys_external_dir.join("by-email");
+        let links_dir = keys_external_dir.join("links");
+        let links_dir_by_keyid = links_dir.join("by-keyid");
+        let links_dir_by_fingerprint = links_dir.join("by-fpr");
+        let links_dir_by_email = links_dir.join("by-email");
         create_dir_all(&links_dir_by_keyid)?;
         create_dir_all(&links_dir_by_fingerprint)?;
         create_dir_all(&links_dir_by_email)?;

hagrid-routes.conf

@@ -24,21 +24,21 @@ location /vks/v1/ {
         default_type application/pgp-keys;
         add_header Content-Disposition 'attachment; filename="$1$2$3.asc"';
         add_header 'Access-Control-Allow-Origin' '*';
-        try_files /keys/by-email/$1/$2/$3 @fallback;
+        try_files /keys/links/by-email/$1/$2/$3 @fallback;
     }
 
     location ~ ^/vks/v1/by-fingerprint/(?:0x)?([^/][^/])([^/][^/])(..*)$ {
         default_type application/pgp-keys;
         add_header Content-Disposition 'attachment; filename="$1$2$3.asc"';
         add_header 'Access-Control-Allow-Origin' '*';
-        try_files /keys/by-fpr/$1/$2/$3 @fallback;
+        try_files /keys/links/by-fpr/$1/$2/$3 @fallback;
     }
 
     location ~ ^/vks/v1/by-keyid/(?:0x)?([^/][^/])([^/][^/])(.*)$ {
         default_type application/pgp-keys;
         add_header Content-Disposition 'attachment; filename="$1$2$3.asc"';
         add_header 'Access-Control-Allow-Origin' '*';
-        try_files /keys/by-keyid/$1/$2/$3 @fallback;
+        try_files /keys/links/by-keyid/$1/$2/$3 @fallback;
     }
 
     proxy_pass http://127.0.0.1:8080;

hagridctl/src/regenerate.rs

@@ -77,7 +77,7 @@ pub fn do_regenerate(config: &HagridConfig) -> Result<()> {
         false,
     )?;
 
-    let published_dir = config.keys_external_dir.as_ref().unwrap().join("published");
+    let published_dir = config.keys_external_dir.as_ref().unwrap().join("pub");
     let dirs: Vec<_> = WalkDir::new(published_dir)
         .min_depth(1)
         .max_depth(1)