move about pages under /about

dist/templates/about/about.html.hbs

@@ -1,6 +1,6 @@
 {{#> layout }}
 <div class="spacer">
-    <center><h2>About | <a href="/privacy">Privacy Policy</a> | <a href="/apidoc">API Docs</a></h2></center>
+    <center><h2>About | <a href="/about/privacy">Privacy Policy</a> | <a href="/about/api">API Docs</a></h2></center>
 
     <p>
         The <tt>keys.openpgp.org</tt> website is a public service for the
@@ -80,7 +80,7 @@
                         privacy in the OpenPGP ecosystem.</li>
                 </ul>
             </p>
-            <p>See our <a href="/privacy">Privacy Policy</a> for more details on
+            <p>See our <a href="/about/privacy">Privacy Policy</a> for more details on
                 how we store and distribute data.</p>
         </li>
     </ul>

dist/templates/about/api.html.hbs

@@ -1,6 +1,6 @@
 {{#> layout }}
 <div class="spacer">
-  <center><h2><a href="/about">About</a> | <a href="/privacy">Privacy Policy</a> | API Docs</h2></center>
+  <center><h2><a href="/about">About</a> | <a href="/about/privacy">Privacy Policy</a> | API Docs</h2></center>
 
   <p>
     Hagrid implements both the legacy HKP interface, as well as our

dist/templates/about/privacy.html.hbs

@@ -1,7 +1,7 @@
 {{#> layout }}
 <div class="spacer">
 
-    <center><h2><a href="/about">About</a> | Privacy Policy | <a href="/apidoc">API Docs</a></h2></center>
+    <center><h2><a href="/about">About</a> | Privacy Policy | <a href="/about/api">API Docs</a></h2></center>
 
     <p style="text-align: left;">
         The public keyserver running on keys.openpgp.org processes, stores and
@@ -61,8 +61,8 @@
           </li>
       </ul>
       <p style="text-align: left">Data is never relayed to third parties outside of
-          what is available from the <a href="/apidoc">public API interfaces</a>, and what is described in
-          this policy.
+          what is available from the <a href="/about/api">public API interfaces</a>,
+          and what is described in this policy.
       </p>
 </div>
 {{/layout}}

src/web/mod.rs

@@ -406,17 +406,17 @@ fn root() -> Template {
 
 #[get("/about")]
 fn about() -> Template {
-    Template::render("about", templates::General::default())
+    Template::render("about/about", templates::General::default())
 }
 
-#[get("/privacy")]
+#[get("/about/privacy")]
 fn privacy() -> Template {
-    Template::render("privacy", templates::General::default())
+    Template::render("about/privacy", templates::General::default())
 }
 
-#[get("/apidoc")]
+#[get("/about/api")]
 fn apidoc() -> Template {
-    Template::render("apidoc", templates::General::default())
+    Template::render("about/api", templates::General::default())
 }
 
 pub fn serve() -> Result<()> {